From 5b7f06c24edca384a8d7b4704974512e26bf25d9 Mon Sep 17 00:00:00 2001
From: Levente Balogh <balogh.levente.hu@gmail.com>
Date: Tue, 8 Jul 2025 07:10:19 +0200
Subject: [PATCH 01/21] Extensions: Wrap extension components with a sandbox
 wrapper div (#103064)

* feat(sandbox): wrap extension components with sandbox wrapper div

* fix: remove circular dependency

This was caused by sandbox_plugin_loader_registry -> helpers -> backend_srv -> ... plugin_loader -> setup.

* fix: add dependency to react hook

* tests: add tests for extensions sandbox wrapper

* fix: only wrap modal content after plugin loading

* chore: remove unused code

* Wip

* review(actions.ts): extract logic to function

* test: remove testing app id

* tests: fix extension utils tests

* tests: remove unnecessary code
---
 public/app/features/plugins/admin/helpers.ts  | 10 ------
 .../admin/pages/PluginDetails.test.tsx        | 22 ++++++------
 .../features/plugins/admin/state/actions.ts   | 11 +++++-
 .../plugins/extensions/utils.test.tsx         | 31 +++++++++++++++-
 .../app/features/plugins/extensions/utils.tsx |  4 ++-
 .../plugins/sandbox/sandbox_components.tsx    | 36 ++++++++++++++++++-
 6 files changed, 90 insertions(+), 24 deletions(-)

diff --git a/public/app/features/plugins/admin/helpers.ts b/public/app/features/plugins/admin/helpers.ts
index 38660fba145..b13716b8ca2 100644
--- a/public/app/features/plugins/admin/helpers.ts
+++ b/public/app/features/plugins/admin/helpers.ts
@@ -2,9 +2,7 @@ import uFuzzy from '@leeoniya/ufuzzy';
 
 import { PluginSignatureStatus, dateTimeParse, PluginError, PluginType, PluginErrorCode } from '@grafana/data';
 import { config, featureEnabled } from '@grafana/runtime';
-import { Settings } from 'app/core/config';
 import { contextSrv } from 'app/core/core';
-import { getBackendSrv } from 'app/core/services/backend_srv';
 import { AccessControlAction } from 'app/types';
 
 import {
@@ -341,14 +339,6 @@ function getPluginSignature(options: {
   return PluginSignatureStatus.missing;
 }
 
-// Updates the core Grafana config to have the correct list available panels
-export const updatePanels = () =>
-  getBackendSrv()
-    .get('/api/frontend/settings')
-    .then((settings: Settings) => {
-      config.panels = settings.panels;
-    });
-
 export function getLatestCompatibleVersion(versions: Version[] | undefined): Version | undefined {
   if (!versions) {
     return;
diff --git a/public/app/features/plugins/admin/pages/PluginDetails.test.tsx b/public/app/features/plugins/admin/pages/PluginDetails.test.tsx
index 42b83c85835..b725d3a9d58 100644
--- a/public/app/features/plugins/admin/pages/PluginDetails.test.tsx
+++ b/public/app/features/plugins/admin/pages/PluginDetails.test.tsx
@@ -11,7 +11,7 @@ import {
 } from '@grafana/data';
 import { GrafanaEdition } from '@grafana/data/internal';
 import { selectors } from '@grafana/e2e-selectors';
-import { config } from '@grafana/runtime';
+import { config, getBackendSrv, setBackendSrv } from '@grafana/runtime';
 import { configureStore } from 'app/store/configureStore';
 
 import * as api from '../api';
@@ -30,10 +30,10 @@ import {
 import PluginDetailsPage from './PluginDetails';
 
 jest.mock('@grafana/runtime', () => {
-  const original = jest.requireActual('@grafana/runtime');
-  const mockedRuntime = { ...original };
-  mockedRuntime.config.buildInfo.version = 'v8.1.0';
-  return mockedRuntime;
+  const runtime = jest.requireActual('@grafana/runtime');
+  runtime.config.buildInfo.version = 'v8.1.0';
+
+  return runtime;
 });
 
 jest.mock('../hooks/usePluginConfig.tsx', () => ({
@@ -44,11 +44,6 @@ jest.mock('../hooks/usePluginConfig.tsx', () => ({
   })),
 }));
 
-jest.mock('../helpers.ts', () => ({
-  ...jest.requireActual('../helpers.ts'),
-  updatePanels: jest.fn(),
-}));
-
 jest.mock('app/core/core', () => ({
   contextSrv: {
     hasPermission: (action: string) => true,
@@ -85,6 +80,7 @@ describe('Plugin details page', () => {
   const id = 'my-plugin';
   const originalWindowLocation = window.location;
   let dateNow: jest.SpyInstance<number, []>;
+  const originalBackendSrv = getBackendSrv();
 
   beforeAll(() => {
     dateNow = jest.spyOn(Date, 'now').mockImplementation(() => 1609470000000); // 2021-01-01 04:00:00
@@ -100,6 +96,7 @@ describe('Plugin details page', () => {
     jest.clearAllMocks();
     config.pluginAdminExternalManageEnabled = false;
     config.licenseInfo.enabledFeatures = {};
+    setBackendSrv(originalBackendSrv);
   });
 
   afterAll(() => {
@@ -422,6 +419,11 @@ describe('Plugin details page', () => {
       // @ts-ignore
       api.uninstallPlugin = jest.fn();
 
+      setBackendSrv({
+        ...originalBackendSrv,
+        get: jest.fn().mockResolvedValue({ panels: [] }),
+      });
+
       const { queryByText, getByRole, findByRole, user } = renderPluginDetails({
         id,
         name: 'Akumuli',
diff --git a/public/app/features/plugins/admin/state/actions.ts b/public/app/features/plugins/admin/state/actions.ts
index e08e7241c42..6f2c5400cf0 100644
--- a/public/app/features/plugins/admin/state/actions.ts
+++ b/public/app/features/plugins/admin/state/actions.ts
@@ -3,6 +3,7 @@ import { from, forkJoin, timeout, lastValueFrom, catchError, of } from 'rxjs';
 
 import { PanelPlugin, PluginError } from '@grafana/data';
 import { config, getBackendSrv, isFetchError } from '@grafana/runtime';
+import { Settings } from 'app/core/config';
 import { importPanelPlugin } from 'app/features/plugins/importPanelPlugin';
 import { StoreState, ThunkResult } from 'app/types';
 
@@ -18,7 +19,7 @@ import {
   getProvisionedPlugins,
 } from '../api';
 import { STATE_PREFIX } from '../constants';
-import { mapLocalToCatalog, mergeLocalsAndRemotes, updatePanels } from '../helpers';
+import { mapLocalToCatalog, mergeLocalsAndRemotes } from '../helpers';
 import { CatalogPlugin, RemotePlugin, LocalPlugin, InstancePlugin, ProvisionedPlugin, PluginStatus } from '../types';
 
 // Fetches
@@ -278,3 +279,11 @@ export const loadPanelPlugin = (id: string): ThunkResult<Promise<PanelPlugin>> =
     return plugin;
   };
 };
+
+function updatePanels() {
+  return getBackendSrv()
+    .get('/api/frontend/settings')
+    .then((settings: Settings) => {
+      config.panels = settings.panels;
+    });
+}
diff --git a/public/app/features/plugins/extensions/utils.test.tsx b/public/app/features/plugins/extensions/utils.test.tsx
index e3b74d8cd1a..a99df507d1b 100644
--- a/public/app/features/plugins/extensions/utils.test.tsx
+++ b/public/app/features/plugins/extensions/utils.test.tsx
@@ -7,6 +7,7 @@ import appEvents from 'app/core/app_events';
 import { ShowModalReactEvent } from 'app/types/events';
 
 import { log } from './logs/log';
+import { resetLogMock } from './logs/testUtils';
 import {
   deepFreeze,
   handleErrorsInFn,
@@ -26,7 +27,7 @@ import {
 
 jest.mock('app/features/plugins/pluginSettings', () => ({
   ...jest.requireActual('app/features/plugins/pluginSettings'),
-  getPluginSettings: () => Promise.resolve({ info: { version: '1.0.0' } }),
+  getPluginSettings: () => Promise.resolve({ info: { version: '1.0.0' }, id: 'test-plugin' }),
 }));
 
 describe('Plugin Extensions / Utils', () => {
@@ -36,6 +37,9 @@ describe('Plugin Extensions / Utils', () => {
     jest.spyOn(log, 'error').mockImplementation(() => {});
     jest.spyOn(log, 'warning').mockImplementation(() => {});
     jest.spyOn(log, 'debug').mockImplementation(() => {});
+    jest.spyOn(log, 'info').mockImplementation(() => {});
+    jest.spyOn(log, 'trace').mockImplementation(() => {});
+    jest.spyOn(log, 'fatal').mockImplementation(() => {});
   });
 
   afterEach(() => {
@@ -723,6 +727,27 @@ describe('Plugin Extensions / Utils', () => {
       expect(modal).toHaveTextContent('Version: 1.0.0');
     });
 
+    it('should add a wrapper div with a "data-plugin-sandbox" attribute', async () => {
+      const pluginId = 'grafana-worldmap-panel';
+      const openModal = createOpenModalFunction({
+        pluginId,
+        extensionPointId: 'myorg-extensions-app/link/v1',
+        title: 'Title in modal',
+      });
+
+      openModal({
+        title: 'Title in modal',
+        body: () => <div>Text in body</div>,
+      });
+
+      expect(await screen.findByRole('dialog')).toBeVisible();
+
+      expect(screen.getByTestId('plugin-sandbox-wrapper')).toHaveAttribute(
+        'data-plugin-sandbox',
+        'grafana-worldmap-panel'
+      );
+    });
+
     it('should show an error alert in the modal IN DEV MODE if the extension throws an error', async () => {
       config.buildInfo.env = 'development';
       jest.spyOn(console, 'error').mockImplementation(() => {});
@@ -816,6 +841,10 @@ describe('Plugin Extensions / Utils', () => {
       );
     };
 
+    beforeEach(() => {
+      resetLogMock(log);
+    });
+
     it('should make the plugin context available for the wrapped component', async () => {
       const pluginId = 'grafana-worldmap-panel';
       const Component = wrapWithPluginContext({
diff --git a/public/app/features/plugins/extensions/utils.tsx b/public/app/features/plugins/extensions/utils.tsx
index 23d21c11058..63a2d2bfc83 100644
--- a/public/app/features/plugins/extensions/utils.tsx
+++ b/public/app/features/plugins/extensions/utils.tsx
@@ -133,7 +133,9 @@ const getModalWrapper = ({
           fallbackAlwaysVisible={true}
           log={baseLog}
         >
-          <Body onDismiss={onDismiss} />
+          <div data-plugin-sandbox={config.pluginId} data-testid="plugin-sandbox-wrapper">
+            <Body onDismiss={onDismiss} />
+          </div>
         </ExtensionErrorBoundary>
       </Modal>
     );
diff --git a/public/app/features/plugins/sandbox/sandbox_components.tsx b/public/app/features/plugins/sandbox/sandbox_components.tsx
index 7e11e8428bc..29205b06bc0 100644
--- a/public/app/features/plugins/sandbox/sandbox_components.tsx
+++ b/public/app/features/plugins/sandbox/sandbox_components.tsx
@@ -2,7 +2,12 @@ import { isFunction } from 'lodash';
 import { ComponentType, FC } from 'react';
 import * as React from 'react';
 
-import { GrafanaPlugin, PluginType } from '@grafana/data';
+import {
+  GrafanaPlugin,
+  PluginExtensionAddedComponentConfig,
+  PluginExtensionExposedComponentConfig,
+  PluginType,
+} from '@grafana/data';
 
 import { SandboxPluginMeta, SandboxedPluginObject } from './types';
 import { isSandboxedPluginObject } from './utils';
@@ -58,6 +63,35 @@ export async function sandboxPluginComponents(
     Reflect.set(pluginObject, 'root', withSandboxWrapper(Reflect.get(pluginObject, 'root'), meta));
   }
 
+  // Extensions: added components
+  if (Reflect.has(pluginObject, 'addedComponentConfigs')) {
+    const addedComponents: PluginExtensionAddedComponentConfig[] = Reflect.get(pluginObject, 'addedComponentConfigs');
+    for (const addedComponent of addedComponents) {
+      if (Reflect.has(addedComponent, 'component')) {
+        Reflect.set(addedComponent, 'component', withSandboxWrapper(Reflect.get(addedComponent, 'component'), meta));
+      }
+    }
+    Reflect.set(pluginObject, 'addedComponentConfigs', addedComponents);
+  }
+
+  // Extensions: exposed components
+  if (Reflect.has(pluginObject, 'exposedComponentConfigs')) {
+    const exposedComponents: PluginExtensionExposedComponentConfig[] = Reflect.get(
+      pluginObject,
+      'exposedComponentConfigs'
+    );
+    for (const exposedComponent of exposedComponents) {
+      if (Reflect.has(exposedComponent, 'component')) {
+        Reflect.set(
+          exposedComponent,
+          'component',
+          withSandboxWrapper(Reflect.get(exposedComponent, 'component'), meta)
+        );
+      }
+    }
+    Reflect.set(pluginObject, 'exposedComponentConfigs', exposedComponents);
+  }
+
   // config pages
   if (Reflect.has(pluginObject, 'configPages')) {
     const configPages: NonNullable<GrafanaPlugin['configPages']> = Reflect.get(pluginObject, 'configPages') ?? [];

From de50c5a497a4c085462c5fb7cab5da1c438579f4 Mon Sep 17 00:00:00 2001
From: Fayzal Ghantiwala <114010985+fayzal-g@users.noreply.github.com>
Date: Tue, 8 Jul 2025 10:03:26 +0100
Subject: [PATCH 02/21] Alerting: Fix crypto_test.go errors in CI (#107759)

Fix test
---
 pkg/services/ngalert/notifier/crypto_test.go | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkg/services/ngalert/notifier/crypto_test.go b/pkg/services/ngalert/notifier/crypto_test.go
index c50d3d2967a..94a78c7d402 100644
--- a/pkg/services/ngalert/notifier/crypto_test.go
+++ b/pkg/services/ngalert/notifier/crypto_test.go
@@ -36,7 +36,9 @@ func TestEncryptExtraConfigs(t *testing.T) {
 			m := fakes.NewFakeSecretsService()
 
 			c := &alertmanagerCrypto{
-				secrets: m,
+				ExtraConfigsCrypto: &ExtraConfigsCrypto{
+					secrets: m,
+				},
 			}
 
 			cfg := &definitions.PostableUserConfig{
@@ -83,7 +85,9 @@ func TestDecryptExtraConfigs(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			m := fakes.NewFakeSecretsService()
 			c := &alertmanagerCrypto{
-				secrets: m,
+				ExtraConfigsCrypto: &ExtraConfigsCrypto{
+					secrets: m,
+				},
 			}
 
 			cfg := &definitions.PostableUserConfig{

From 509990ca897049cab45ddb07b81dbcb1bf4c39c2 Mon Sep 17 00:00:00 2001
From: Tobias Skarhed <1438972+tskarhed@users.noreply.github.com>
Date: Tue, 8 Jul 2025 11:30:46 +0200
Subject: [PATCH 03/21] Variables: Change vis library from visj-network to
 vis-network (#107712)

* Change from visj-network to vis-network

* Check that ref exists

* Remove vis-util as a direct dependency

* Update betterer

* Address PR feedback
---
 .betterer.results                             |  5 +-
 package.json                                  |  3 +-
 .../variables/inspect/NetworkGraph.tsx        | 55 +++++---------
 yarn.lock                                     | 74 ++++++-------------
 4 files changed, 47 insertions(+), 90 deletions(-)

diff --git a/.betterer.results b/.betterer.results
index e84c90caa42..fa1406d7eb5 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -2897,10 +2897,7 @@ exports[`better eslint`] = {
     ],
     "public/app/features/variables/inspect/NetworkGraph.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
     ],
     "public/app/features/variables/inspect/VariablesUnknownTable.tsx:5381": [
       [0, 0, 0, "\'HorizontalGroup\' import from \'@grafana/ui\' is restricted from being used by a pattern. Use Stack component instead.", "0"],
diff --git a/package.json b/package.json
index 5bc553728f6..287bf23e960 100644
--- a/package.json
+++ b/package.json
@@ -424,7 +424,8 @@
     "type-fest": "^4.18.2",
     "uplot": "1.6.32",
     "uuid": "11.1.0",
-    "visjs-network": "4.25.0",
+    "vis-data": "^7.1.10",
+    "vis-network": "9.1.13",
     "whatwg-fetch": "3.6.20"
   },
   "resolutions": {
diff --git a/public/app/features/variables/inspect/NetworkGraph.tsx b/public/app/features/variables/inspect/NetworkGraph.tsx
index 78b6977359c..cbcb413ea4d 100644
--- a/public/app/features/variables/inspect/NetworkGraph.tsx
+++ b/public/app/features/variables/inspect/NetworkGraph.tsx
@@ -1,4 +1,6 @@
-import { useCallback, useEffect, useRef } from 'react';
+import { useEffect, useRef } from 'react';
+import type { DataSet } from 'vis-data';
+import type { Network, Options, Data, Edge, Node } from 'vis-network';
 
 import { GraphEdge, GraphNode } from './utils';
 
@@ -6,7 +8,6 @@ interface OwnProps {
   nodes: GraphNode[];
   edges: GraphEdge[];
   direction?: 'UD' | 'DU' | 'LR' | 'RL';
-  onDoubleClick?: (node: string) => void;
   width?: string;
   height?: string;
 }
@@ -17,28 +18,19 @@ interface DispatchProps {}
 
 export type Props = OwnProps & ConnectedProps & DispatchProps;
 
-export const NetworkGraph = ({ nodes, edges, direction, width, height, onDoubleClick }: Props) => {
-  const network = useRef<any>(null);
-  const ref = useRef(null);
-
-  const onNodeDoubleClick = useCallback(
-    (params: { nodes: string[] }) => {
-      if (onDoubleClick) {
-        onDoubleClick(params.nodes[0]);
-      }
-    },
-    [onDoubleClick]
-  );
+export const NetworkGraph = ({ nodes, edges, direction, width, height }: Props) => {
+  const network = useRef<Network | null>(null);
+  const ref = useRef<HTMLDivElement>(null);
 
   useEffect(() => {
     const createNetwork = async () => {
-      // @ts-ignore no types yet for visjs-network
-      const visJs = await import(/* webpackChunkName: "visjs-network" */ 'visjs-network');
-      const data = {
-        nodes: toVisNetworkNodes(visJs, nodes),
-        edges: toVisNetworkEdges(visJs, edges),
+      const visJs = await import(/* webpackChunkName: "vis-network" */ 'vis-network');
+      const visData = await import(/* webpackChunkName: "vis-data" */ 'vis-data');
+      const data: Data = {
+        nodes: toVisNetworkNodes(visData, nodes),
+        edges: toVisNetworkEdges(visData, edges),
       };
-      const options = {
+      const options: Options = {
         width: '100%',
         height: '100%',
         autoResize: true,
@@ -55,20 +47,13 @@ export const NetworkGraph = ({ nodes, edges, direction, width, height, onDoubleC
           dragNodes: false,
         },
       };
-
-      network.current = new visJs.Network(ref.current, data, options);
-      network.current?.on('doubleClick', onNodeDoubleClick);
+      if (ref.current) {
+        network.current = new visJs.Network(ref.current, data, options);
+      }
     };
 
     createNetwork();
-
-    return () => {
-      // unsubscribe event handlers
-      if (network.current) {
-        network.current.off('doubleClick');
-      }
-    };
-  }, [direction, edges, nodes, onNodeDoubleClick]);
+  }, [direction, edges, nodes]);
 
   return (
     <div>
@@ -77,15 +62,15 @@ export const NetworkGraph = ({ nodes, edges, direction, width, height, onDoubleC
   );
 };
 
-function toVisNetworkNodes(visJs: any, nodes: GraphNode[]): any[] {
+function toVisNetworkNodes(visData: any, nodes: GraphNode[]): DataSet<Node> {
   const nodesWithStyle = nodes.map((node) => ({
     ...node,
     shape: 'box',
   }));
-  return new visJs.DataSet(nodesWithStyle);
+  return new visData.DataSet(nodesWithStyle);
 }
 
-function toVisNetworkEdges(visJs: any, edges: GraphEdge[]): any[] {
+function toVisNetworkEdges(visData: any, edges: GraphEdge[]): DataSet<Edge> {
   const edgesWithStyle = edges.map((edge) => ({ ...edge, arrows: 'to', dashes: true }));
-  return new visJs.DataSet(edgesWithStyle);
+  return new visData.DataSet(edgesWithStyle);
 }
diff --git a/yarn.lock b/yarn.lock
index 896049380f9..4527dcfdf6d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15391,13 +15391,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"emitter-component@npm:^1.1.1":
-  version: 1.1.1
-  resolution: "emitter-component@npm:1.1.1"
-  checksum: 10/b43814692fb874c1a75c3c417670123ab33961225b73fa680501dbd5d4ab779ef37082570fb64516bf12cedd906842eea0bccbf1d3bc530162e86bafa17d2737
-  languageName: node
-  linkType: hard
-
 "emittery@npm:^0.13.1":
   version: 0.13.1
   resolution: "emittery@npm:0.13.1"
@@ -18424,7 +18417,8 @@ __metadata:
     typescript: "npm:5.8.3"
     uplot: "npm:1.6.32"
     uuid: "npm:11.1.0"
-    visjs-network: "npm:4.25.0"
+    vis-data: "npm:^7.1.10"
+    vis-network: "npm:9.1.13"
     webpack: "npm:5.97.1"
     webpack-assets-manifest: "npm:^5.1.0"
     webpack-cli: "npm:6.0.1"
@@ -18483,13 +18477,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"hammerjs@npm:^2.0.8":
-  version: 2.0.8
-  resolution: "hammerjs@npm:2.0.8"
-  checksum: 10/9155d056f252ef35e8ca258dbb5ee2c9d8794f6805d083da7d1d9763d185e3e149459ecc2b36ccce584e3cd5f099fd9fa55056e3bcc7724046390f2e5ae25815
-  languageName: node
-  linkType: hard
-
 "handle-thing@npm:^2.0.0":
   version: 2.0.1
   resolution: "handle-thing@npm:2.0.1"
@@ -21458,13 +21445,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"keycharm@npm:^0.2.0":
-  version: 0.2.0
-  resolution: "keycharm@npm:0.2.0"
-  checksum: 10/9c0f227fddfb8f82dbe6ff6450c1d3110d10715eaab2034ef656ce1be4900a979ce7994ecef0ef8bfc190c9f11c1a82e5f454052fa92142c44e6843bcff1249f
-  languageName: node
-  linkType: hard
-
 "keycode@npm:^2.2.0":
   version: 2.2.0
   resolution: "keycode@npm:2.2.0"
@@ -23090,7 +23070,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"moment@npm:2.30.1, moment@npm:^2.20.1, moment@npm:^2.29.4, moment@npm:^2.30.1":
+"moment@npm:2.30.1, moment@npm:^2.29.4, moment@npm:^2.30.1":
   version: 2.30.1
   resolution: "moment@npm:2.30.1"
   checksum: 10/ae42d876d4ec831ef66110bdc302c0657c664991e45cf2afffc4b0f6cd6d251dde11375c982a5c0564ccc0fa593fc564576ddceb8c8845e87c15f58aa6baca69
@@ -25960,15 +25940,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"propagating-hammerjs@npm:^1.4.6":
-  version: 1.5.0
-  resolution: "propagating-hammerjs@npm:1.5.0"
-  dependencies:
-    hammerjs: "npm:^2.0.8"
-  checksum: 10/ff83ae333e69942af80af5ce53d240a63a8d63c96cbee1771bbe194ef70ee2977b31f909ea952c13a0d155ffc059e6f71253f04f40299842354b2b8ffc081d48
-  languageName: node
-  linkType: hard
-
 "property-information@npm:^5.0.0":
   version: 5.6.0
   resolution: "property-information@npm:5.6.0"
@@ -30581,13 +30552,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"timsort@npm:^0.3.0":
-  version: 0.3.0
-  resolution: "timsort@npm:0.3.0"
-  checksum: 10/f4b8e0afa770440660b98034d7170333033b96fb6cb32d2fdfab65f78ba7741b9e271e2351631daacfa78a471d33f8ea1f5a29f94e960621f25045bfada46f3f
-  languageName: node
-  linkType: hard
-
 "tiny-invariant@npm:^1.0.1, tiny-invariant@npm:^1.0.2, tiny-invariant@npm:^1.0.6, tiny-invariant@npm:^1.2.0, tiny-invariant@npm:^1.3.1, tiny-invariant@npm:^1.3.3":
   version: 1.3.3
   resolution: "tiny-invariant@npm:1.3.3"
@@ -31946,17 +31910,27 @@ __metadata:
   languageName: node
   linkType: hard
 
-"visjs-network@npm:4.25.0":
-  version: 4.25.0
-  resolution: "visjs-network@npm:4.25.0"
-  dependencies:
-    emitter-component: "npm:^1.1.1"
-    hammerjs: "npm:^2.0.8"
-    keycharm: "npm:^0.2.0"
-    moment: "npm:^2.20.1"
-    propagating-hammerjs: "npm:^1.4.6"
-    timsort: "npm:^0.3.0"
-  checksum: 10/9914c6df0e56c22bebf43ed4a3799ecc84bc2430de776cb0b3b3b51e02454b3fe7093bb8017b6ac43717aa1458a839a4ffcf30feae2fae31b4d88358f3e6d34a
+"vis-data@npm:^7.1.10":
+  version: 7.1.10
+  resolution: "vis-data@npm:7.1.10"
+  peerDependencies:
+    uuid: ^3.4.0 || ^7.0.0 || ^8.0.0 || ^9.0.0 || ^10.0.0 || ^11.0.0
+    vis-util: ^5.0.1
+  checksum: 10/23fb2ef26864153013372e1d95107765be86dd9ce96f987bf99fdd93759fbe5ec1bd2603d354ca18a03f0fb607b829396ec02fe005aead63ef24599512f21402
+  languageName: node
+  linkType: hard
+
+"vis-network@npm:9.1.13":
+  version: 9.1.13
+  resolution: "vis-network@npm:9.1.13"
+  peerDependencies:
+    "@egjs/hammerjs": ^2.0.0
+    component-emitter: ^1.3.0 || ^2.0.0
+    keycharm: ^0.2.0 || ^0.3.0 || ^0.4.0
+    uuid: ^3.4.0 || ^7.0.0 || ^8.0.0 || ^9.0.0 || ^10.0.0 || ^11.0.0
+    vis-data: ^6.3.0 || ^7.0.0
+    vis-util: ^5.0.1
+  checksum: 10/7fd7264ee0a79282596efece988a78c037c418fa5e79aba632521a3093e9742a438b254dc698f488eb7707e3f7033352c25e7651a8d49b42662af0b368a12db7
   languageName: node
   linkType: hard
 

From 89e8a038599dfeaae73e5df94528e4aba7aa4537 Mon Sep 17 00:00:00 2001
From: Matias Chomicki <matias.chomicki@grafana.com>
Date: Tue, 8 Jul 2025 11:57:28 +0200
Subject: [PATCH 04/21] New Log Details: Add support to sort displayed fields
 (#107635)

* Create LogLineDetailsDisplayedFields

* Log labels: properly implement plurals

* Pluralize

* LogListContext: pass setDisplayedFields

* LogLineDetailsDisplayedFields: update displayed fields

* LogLineDetails: scroll to item after opening details

* LogListContext: serve logOptionsStorageKey

* Update test

* Missing translations

* LogLineDetailsDisplayedFields: update styles

* LogLineDetails: update text selectors

* Update tests

* Reorganize log details: improve discoverability

* Update test
---
 public/app/features/explore/Logs/Logs.tsx     |  1 +
 .../components/panel/LogLineDetails.test.tsx  | 46 ++++++++--
 .../logs/components/panel/LogLineDetails.tsx  | 14 ++-
 .../panel/LogLineDetailsComponent.tsx         | 17 +++-
 .../panel/LogLineDetailsDisplayedFields.tsx   | 91 +++++++++++++++++++
 .../logs/components/panel/LogList.tsx         | 26 +++++-
 .../logs/components/panel/LogListContext.tsx  |  4 +
 public/app/features/logs/utils.ts             | 12 +--
 public/app/plugins/panel/logs/LogsPanel.tsx   |  1 +
 public/locales/en-US/grafana.json             | 15 +--
 10 files changed, 197 insertions(+), 30 deletions(-)
 create mode 100644 public/app/features/logs/components/panel/LogLineDetailsDisplayedFields.tsx

diff --git a/public/app/features/explore/Logs/Logs.tsx b/public/app/features/explore/Logs/Logs.tsx
index c51cbfb7d4d..897bca4f24d 100644
--- a/public/app/features/explore/Logs/Logs.tsx
+++ b/public/app/features/explore/Logs/Logs.tsx
@@ -1144,6 +1144,7 @@ const UnthemedLogs: React.FunctionComponent<Props> = (props: Props) => {
                   permalinkedLogId={panelState?.logs?.id}
                   pinLineButtonTooltipTitle={pinLineButtonTooltipTitle}
                   pinnedLogs={pinnedLogs}
+                  setDisplayedFields={setDisplayedFields}
                   showControls
                   showTime={showTime}
                   sortOrder={logsSortOrder}
diff --git a/public/app/features/logs/components/panel/LogLineDetails.test.tsx b/public/app/features/logs/components/panel/LogLineDetails.test.tsx
index 626863e4aec..05c9287e7c3 100644
--- a/public/app/features/logs/components/panel/LogLineDetails.test.tsx
+++ b/public/app/features/logs/components/panel/LogLineDetails.test.tsx
@@ -40,6 +40,7 @@ const setup = (
 
   const props: Props = {
     containerElement: document.createElement('div'),
+    focusLogLine: jest.fn(),
     logs,
     onResize: jest.fn(),
     ...(propOverrides || {}),
@@ -198,8 +199,8 @@ describe('LogLineDetails', () => {
       setup(undefined, { entry: '' });
       expect(screen.queryByText('Fields')).not.toBeInTheDocument();
       expect(screen.queryByText('Links')).not.toBeInTheDocument();
-      expect(screen.queryByText('Indexed labels')).not.toBeInTheDocument();
-      expect(screen.queryByText('Parsed fields')).not.toBeInTheDocument();
+      expect(screen.queryByText(/Indexed label/)).not.toBeInTheDocument();
+      expect(screen.queryByText(/Parsed field/)).not.toBeInTheDocument();
       expect(screen.queryByText('Structured metadata')).not.toBeInTheDocument();
     });
   });
@@ -400,8 +401,8 @@ describe('LogLineDetails', () => {
       expect(screen.getByText('value2')).toBeInTheDocument();
       expect(screen.getByText('label3')).toBeInTheDocument();
       expect(screen.getByText('value3')).toBeInTheDocument();
-      expect(screen.getByText('Indexed labels')).toBeInTheDocument();
-      expect(screen.getByText('Parsed fields')).toBeInTheDocument();
+      expect(screen.getByText(/Indexed label/)).toBeInTheDocument();
+      expect(screen.getByText(/Parsed field/)).toBeInTheDocument();
       expect(screen.getByText('Structured metadata')).toBeInTheDocument();
     });
     test('should not show label types if they are unavailable or not supported', () => {
@@ -427,8 +428,8 @@ describe('LogLineDetails', () => {
       expect(screen.getByText('value3')).toBeInTheDocument();
 
       expect(screen.getByText('Fields')).toBeInTheDocument();
-      expect(screen.queryByText('Indexed labels')).not.toBeInTheDocument();
-      expect(screen.queryByText('Parsed fields')).not.toBeInTheDocument();
+      expect(screen.queryByText(/Indexed label/)).not.toBeInTheDocument();
+      expect(screen.queryByText(/Parsed field/)).not.toBeInTheDocument();
       expect(screen.queryByText('Structured metadata')).not.toBeInTheDocument();
     });
 
@@ -457,4 +458,37 @@ describe('LogLineDetails', () => {
       expect(screen.getAllByText('No results to display.')).toHaveLength(3);
     });
   });
+
+  describe('Label types', () => {
+    test('Does not show displayed fields controls if not present', () => {
+      setup(undefined, { labels: { key1: 'label1', key2: 'label2' } });
+      expect(screen.queryByText('Displayed fields')).not.toBeInTheDocument();
+    });
+
+    test('Does not show displayed fields controls if required props are not present', () => {
+      setup(undefined, { labels: { key1: 'label1', key2: 'label2' } }, { displayedFields: ['key1', 'key2'] });
+      expect(screen.queryByText('Displayed fields')).not.toBeInTheDocument();
+    });
+
+    test('Shows displayed fields controls if required props are present', async () => {
+      const setDisplayedFields = jest.fn();
+      const onClickHideField = jest.fn();
+      setup(
+        undefined,
+        { labels: { key1: 'label1', key2: 'label2' } },
+        { displayedFields: ['key1', 'key2'], setDisplayedFields, onClickHideField }
+      );
+
+      expect(screen.getByText('Organize displayed fields')).toBeInTheDocument();
+      expect(screen.queryAllByLabelText('Remove field')).toHaveLength(0);
+
+      await userEvent.click(screen.getByText('Organize displayed fields'));
+
+      expect(screen.getAllByLabelText('Remove field')).toHaveLength(2);
+
+      await userEvent.click(screen.getAllByLabelText('Remove field')[0]);
+
+      expect(onClickHideField).toHaveBeenCalledWith('key1');
+    });
+  });
 });
diff --git a/public/app/features/logs/components/panel/LogLineDetails.tsx b/public/app/features/logs/components/panel/LogLineDetails.tsx
index 3f04338bf92..212da50add7 100644
--- a/public/app/features/logs/components/panel/LogLineDetails.tsx
+++ b/public/app/features/logs/components/panel/LogLineDetails.tsx
@@ -1,6 +1,6 @@
 import { css } from '@emotion/css';
 import { Resizable } from 're-resizable';
-import { useCallback, useRef } from 'react';
+import { useCallback, useEffect, useRef } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { getDragStyles, useStyles2 } from '@grafana/ui';
@@ -12,17 +12,23 @@ import { LOG_LIST_MIN_WIDTH } from './virtualization';
 
 export interface Props {
   containerElement: HTMLDivElement;
-  logOptionsStorageKey?: string;
+  focusLogLine: (log: LogListModel) => void;
   logs: LogListModel[];
   onResize(): void;
 }
 
-export const LogLineDetails = ({ containerElement, logOptionsStorageKey, logs, onResize }: Props) => {
-  const { detailsWidth, setDetailsWidth, showDetails } = useLogListContext();
+export const LogLineDetails = ({ containerElement, focusLogLine, logs, onResize }: Props) => {
+  const { detailsWidth, logOptionsStorageKey, setDetailsWidth, showDetails } = useLogListContext();
   const styles = useStyles2(getStyles);
   const dragStyles = useStyles2(getDragStyles);
   const containerRef = useRef<HTMLDivElement | null>(null);
 
+  useEffect(() => {
+    focusLogLine(showDetails[0]);
+    // Just once
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
   const handleResize = useCallback(() => {
     if (containerRef.current) {
       setDetailsWidth(containerRef.current.clientWidth);
diff --git a/public/app/features/logs/components/panel/LogLineDetailsComponent.tsx b/public/app/features/logs/components/panel/LogLineDetailsComponent.tsx
index 7ae570d6500..fefd7004879 100644
--- a/public/app/features/logs/components/panel/LogLineDetailsComponent.tsx
+++ b/public/app/features/logs/components/panel/LogLineDetailsComponent.tsx
@@ -10,8 +10,10 @@ import { getLabelTypeFromRow } from '../../utils';
 import { useAttributesExtensionLinks } from '../LogDetails';
 import { createLogLineLinks } from '../logParser';
 
+import { LogLineDetailsDisplayedFields } from './LogLineDetailsDisplayedFields';
 import { LabelWithLinks, LogLineDetailsFields, LogLineDetailsLabelFields } from './LogLineDetailsFields';
 import { LogLineDetailsHeader } from './LogLineDetailsHeader';
+import { useLogListContext } from './LogListContext';
 import { LogListModel } from './processing';
 
 interface LogLineDetailsComponentProps {
@@ -21,6 +23,7 @@ interface LogLineDetailsComponentProps {
 }
 
 export const LogLineDetailsComponent = ({ log, logOptionsStorageKey, logs }: LogLineDetailsComponentProps) => {
+  const { displayedFields, setDisplayedFields } = useLogListContext();
   const [search, setSearch] = useState('');
   const inputRef = useRef('');
   const styles = useStyles2(getStyles);
@@ -65,10 +68,12 @@ export const LogLineDetailsComponent = ({ log, logOptionsStorageKey, logs }: Log
   const fieldsOpen = logOptionsStorageKey
     ? store.getBool(`${logOptionsStorageKey}.log-details.fieldsOpen`, true)
     : true;
+  const displayedFieldsOpen = logOptionsStorageKey
+    ? store.getBool(`${logOptionsStorageKey}.log-details.displayedFieldsOpen`, false)
+    : false;
 
   const handleToggle = useCallback(
     (option: string, isOpen: boolean) => {
-      console.log(option, isOpen);
       store.set(`${logOptionsStorageKey}.log-details.${option}`, isOpen);
     },
     [logOptionsStorageKey]
@@ -100,6 +105,16 @@ export const LogLineDetailsComponent = ({ log, logOptionsStorageKey, logs }: Log
         >
           <div className={styles.logLineWrapper}>{log.raw}</div>
         </ControlledCollapse>
+        {displayedFields.length > 0 && setDisplayedFields && (
+          <ControlledCollapse
+            label={t('logs.log-line-details.displayed-fields-section', 'Organize displayed fields')}
+            collapsible
+            isOpen={displayedFieldsOpen}
+            onToggle={(isOpen: boolean) => handleToggle('displayedFieldsOpen', isOpen)}
+          >
+            <LogLineDetailsDisplayedFields />
+          </ControlledCollapse>
+        )}
         {fieldsWithLinks.links.length > 0 && (
           <ControlledCollapse
             className={styles.collapsable}
diff --git a/public/app/features/logs/components/panel/LogLineDetailsDisplayedFields.tsx b/public/app/features/logs/components/panel/LogLineDetailsDisplayedFields.tsx
new file mode 100644
index 00000000000..f7bbac50ae3
--- /dev/null
+++ b/public/app/features/logs/components/panel/LogLineDetailsDisplayedFields.tsx
@@ -0,0 +1,91 @@
+import { css } from '@emotion/css';
+import { DragDropContext, Draggable, Droppable, DropResult } from '@hello-pangea/dnd';
+import { useCallback } from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { t } from '@grafana/i18n';
+import { Card, IconButton, useStyles2 } from '@grafana/ui';
+
+import { LOG_LINE_BODY_FIELD_NAME } from '../LogDetailsBody';
+
+import { useLogListContext } from './LogListContext';
+
+export const LogLineDetailsDisplayedFields = () => {
+  const { displayedFields, setDisplayedFields } = useLogListContext();
+
+  const onDragEnd = useCallback(
+    (result: DropResult) => {
+      if (result.destination == null) {
+        return;
+      }
+
+      const newDisplayedFields = [...displayedFields];
+      const element = displayedFields[result.source.index];
+      newDisplayedFields.splice(result.source.index, 1);
+      newDisplayedFields.splice(result.destination.index, 0, element);
+
+      setDisplayedFields?.(newDisplayedFields);
+    },
+    [displayedFields, setDisplayedFields]
+  );
+
+  return (
+    <div>
+      <DragDropContext onDragEnd={onDragEnd}>
+        <Droppable ignoreContainerClipping={true} droppableId="displayed-fields" direction="vertical">
+          {(provided) => {
+            return (
+              <>
+                <div ref={provided.innerRef} {...provided.droppableProps}>
+                  {displayedFields.map((field, index) => (
+                    <DraggableDisplayedField key={field} field={field} index={index} />
+                  ))}
+                </div>
+                {provided.placeholder}
+              </>
+            );
+          }}
+        </Droppable>
+      </DragDropContext>
+    </div>
+  );
+};
+
+interface DraggableDisplayedFieldProps {
+  field: string;
+  index: number;
+}
+
+const DraggableDisplayedField = ({ field, index }: DraggableDisplayedFieldProps) => {
+  const { onClickHideField } = useLogListContext();
+  const styles = useStyles2(getStyles);
+  return (
+    <Draggable draggableId={field} index={index}>
+      {(provided) => (
+        <div ref={provided.innerRef} {...provided.draggableProps} {...provided.dragHandleProps}>
+          <Card noMargin className={styles.fieldCard}>
+            <div>
+              {field === LOG_LINE_BODY_FIELD_NAME ? t('logs.log-line-details.log-line-field', 'Log line') : field}
+            </div>
+            {onClickHideField && (
+              <IconButton
+                name="times"
+                onClick={() => onClickHideField(field)}
+                tooltip={t('logs.log-line-details.remove-displayed-field', 'Remove field')}
+              />
+            )}
+          </Card>
+        </div>
+      )}
+    </Draggable>
+  );
+};
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  fieldCard: css({
+    cursor: 'move',
+    padding: theme.spacing(1),
+    marginBottom: theme.spacing(1),
+    wordBreak: 'break-word',
+  }),
+});
diff --git a/public/app/features/logs/components/panel/LogList.tsx b/public/app/features/logs/components/panel/LogList.tsx
index 933ca2dde59..489741fd59b 100644
--- a/public/app/features/logs/components/panel/LogList.tsx
+++ b/public/app/features/logs/components/panel/LogList.tsx
@@ -2,7 +2,7 @@ import { css } from '@emotion/css';
 import { debounce } from 'lodash';
 import { Grammar } from 'prismjs';
 import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState, MouseEvent } from 'react';
-import { VariableSizeList } from 'react-window';
+import { Align, VariableSizeList } from 'react-window';
 
 import {
   AbsoluteTimeRange,
@@ -73,6 +73,7 @@ export interface Props {
   permalinkedLogId?: string;
   pinLineButtonTooltipTitle?: PopoverContent;
   pinnedLogs?: string[];
+  setDisplayedFields?: (displayedFields: string[]) => void;
   showControls: boolean;
   showTime: boolean;
   sortOrder: LogsSortOrder;
@@ -92,6 +93,7 @@ type LogListComponentProps = Omit<
   | 'dedupStrategy'
   | 'displayedFields'
   | 'enableLogDetails'
+  | 'logOptionsStorageKey'
   | 'permalinkedLogId'
   | 'showTime'
   | 'sortOrder'
@@ -135,6 +137,7 @@ export const LogList = ({
   permalinkedLogId,
   pinLineButtonTooltipTitle,
   pinnedLogs,
+  setDisplayedFields,
   showControls,
   showTime,
   sortOrder,
@@ -176,6 +179,7 @@ export const LogList = ({
       permalinkedLogId={permalinkedLogId}
       pinLineButtonTooltipTitle={pinLineButtonTooltipTitle}
       pinnedLogs={pinnedLogs}
+      setDisplayedFields={setDisplayedFields}
       showControls={showControls}
       showTime={showTime}
       sortOrder={sortOrder}
@@ -191,7 +195,6 @@ export const LogList = ({
           initialScrollPosition={initialScrollPosition}
           loading={loading}
           loadMore={loadMore}
-          logOptionsStorageKey={logOptionsStorageKey}
           logs={logs}
           showControls={showControls}
           timeRange={timeRange}
@@ -210,7 +213,6 @@ const LogListComponent = ({
   initialScrollPosition = 'top',
   loading,
   loadMore,
-  logOptionsStorageKey,
   logs,
   showControls,
   timeRange,
@@ -271,6 +273,12 @@ const LogListComponent = ({
     }, 25);
   }, []);
 
+  const debouncedScrollToItem = useMemo(() => {
+    return debounce((index: number, align?: Align) => {
+      listRef.current?.scrollToItem(index, align);
+    }, 250);
+  }, []);
+
   useEffect(() => {
     const subscription = eventBus.subscribe(ScrollToLogsEvent, (e: ScrollToLogsEvent) =>
       handleScrollToEvent(e, logs.length, listRef.current)
@@ -380,6 +388,16 @@ const LogListComponent = ({
     [filterLogs, levelFilteredLogs, matchingUids]
   );
 
+  const focusLogLine = useCallback(
+    (log: LogListModel) => {
+      const index = filteredLogs.indexOf(log);
+      if (index >= 0) {
+        debouncedScrollToItem(index, 'start');
+      }
+    },
+    [debouncedScrollToItem, filteredLogs]
+  );
+
   return (
     <div className={styles.logListContainer}>
       <div className={styles.logListWrapper} ref={wrapperRef}>
@@ -461,7 +479,7 @@ const LogListComponent = ({
       {showDetails.length > 0 && (
         <LogLineDetails
           containerElement={containerElement}
-          logOptionsStorageKey={logOptionsStorageKey}
+          focusLogLine={focusLogLine}
           logs={filteredLogs}
           onResize={handleLogDetailsResize}
         />
diff --git a/public/app/features/logs/components/panel/LogListContext.tsx b/public/app/features/logs/components/panel/LogListContext.tsx
index c638437aa2a..1ca6100a1d1 100644
--- a/public/app/features/logs/components/panel/LogListContext.tsx
+++ b/public/app/features/logs/components/panel/LogListContext.tsx
@@ -162,6 +162,7 @@ export interface Props {
   pinLineButtonTooltipTitle?: PopoverContent;
   pinnedLogs?: string[];
   prettifyJSON?: boolean;
+  setDisplayedFields?: (displayedFields: string[]) => void;
   showControls: boolean;
   showUniqueLabels?: boolean;
   showTime: boolean;
@@ -204,6 +205,7 @@ export const LogListContextProvider = ({
   pinLineButtonTooltipTitle,
   pinnedLogs,
   prettifyJSON,
+  setDisplayedFields,
   showControls,
   showTime,
   showUniqueLabels,
@@ -492,6 +494,7 @@ export const LogListContextProvider = ({
         getRowContextQuery,
         logSupportsContext,
         logLineMenuCustomItems,
+        logOptionsStorageKey,
         onClickFilterLabel,
         onClickFilterOutLabel,
         onClickFilterString,
@@ -509,6 +512,7 @@ export const LogListContextProvider = ({
         prettifyJSON: logListState.prettifyJSON,
         setDedupStrategy,
         setDetailsWidth,
+        setDisplayedFields,
         setFilterLevels,
         setFontSize,
         setForceEscape,
diff --git a/public/app/features/logs/utils.ts b/public/app/features/logs/utils.ts
index 8524f6f1956..0d16732ba7d 100644
--- a/public/app/features/logs/utils.ts
+++ b/public/app/features/logs/utils.ts
@@ -408,17 +408,11 @@ function getDataSourceLabelType(labelType: string, datasourceType: string, plura
     case 'loki':
       switch (labelType) {
         case 'I':
-          return plural
-            ? t('logs.fields.type.loki.indexed-label-plural', 'Indexed labels')
-            : t('logs.fields.type.loki.indexed-label', 'Indexed label');
+          return t('logs.fields.type.loki.indexed-label', 'Indexed label', { count: plural ? 2 : 1 });
         case 'S':
-          return plural
-            ? t('logs.fields.type.loki.structured-metadata-plural', 'Structured metadata')
-            : t('logs.fields.type.loki.structured-metadata', 'Structured metadata');
+          return t('logs.fields.type.loki.structured-metadata', 'Structured metadata', { count: plural ? 2 : 1 });
         case 'P':
-          return plural
-            ? t('logs.fields.type.loki.parsed-label-plural', 'Parsed fields')
-            : t('logs.fields.type.loki.parsedl-label', 'Parsed field');
+          return t('logs.fields.type.loki.parsedl-label', 'Parsed field', { count: plural ? 2 : 1 });
         default:
           return null;
       }
diff --git a/public/app/plugins/panel/logs/LogsPanel.tsx b/public/app/plugins/panel/logs/LogsPanel.tsx
index a55bdd30a46..709055ce389 100644
--- a/public/app/plugins/panel/logs/LogsPanel.tsx
+++ b/public/app/plugins/panel/logs/LogsPanel.tsx
@@ -565,6 +565,7 @@ export const LogsPanel = ({
               onOpenContext={onOpenContext}
               onPermalinkClick={showPermaLink() ? onPermalinkClick : undefined}
               permalinkedLogId={getLogsPanelState()?.logs?.id ?? undefined}
+              setDisplayedFields={setDisplayedFields}
               showControls={Boolean(showControls)}
               showTime={showTime}
               sortOrder={sortOrder}
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index 2a3a370bb07..197750619cf 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -8644,12 +8644,12 @@
     "fields": {
       "type": {
         "loki": {
-          "indexed-label": "Indexed label",
-          "indexed-label-plural": "Indexed labels",
-          "parsed-label-plural": "Parsed fields",
-          "parsedl-label": "Parsed field",
-          "structured-metadata": "Structured metadata",
-          "structured-metadata-plural": "Structured metadata"
+          "indexed-label_one": "Indexed label",
+          "indexed-label_other": "Indexed labels",
+          "parsedl-label_one": "Parsed field",
+          "parsedl-label_other": "Parsed fields",
+          "structured-metadata_one": "Structured metadata",
+          "structured-metadata_other": "Structured metadata"
         }
       }
     },
@@ -8706,6 +8706,7 @@
       "close": "Close log details",
       "copy-shortlink": "Copy shortlink",
       "copy-to-clipboard": "Copy to clipboard",
+      "displayed-fields-section": "Organize displayed fields",
       "fields": {
         "adhoc-statistics": "Ad-hoc statistics",
         "copy-value-to-clipboard": "Copy value to clipboard",
@@ -8719,9 +8720,11 @@
       "fields-section": "Fields",
       "hide-log-line": "Hide log line",
       "links-section": "Links",
+      "log-line-field": "Log line",
       "log-line-section": "Log line",
       "no-details": "No fields to display.",
       "pin-line": "Pin log",
+      "remove-displayed-field": "Remove field",
       "search": {
         "no-results": "No results to display."
       },

From d22842b52b23d76f3a7da2d58ddb4884d42ae715 Mon Sep 17 00:00:00 2001
From: "grafana-pr-automation[bot]"
 <140550294+grafana-pr-automation[bot]@users.noreply.github.com>
Date: Tue, 8 Jul 2025 10:03:08 +0000
Subject: [PATCH 05/21] I18n: Download translations from Crowdin (#107750)

New Crowdin translations by GitHub Action

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .../src/locales/cs-CZ/grafana-prometheus.json |  38 ++
 .../src/locales/de-DE/grafana-prometheus.json |  38 ++
 .../src/locales/es-ES/grafana-prometheus.json |  38 ++
 .../src/locales/fr-FR/grafana-prometheus.json |  38 ++
 .../src/locales/hu-HU/grafana-prometheus.json |  38 ++
 .../src/locales/id-ID/grafana-prometheus.json |  38 ++
 .../src/locales/it-IT/grafana-prometheus.json |  38 ++
 .../src/locales/ja-JP/grafana-prometheus.json |  38 ++
 .../src/locales/ko-KR/grafana-prometheus.json |  38 ++
 .../src/locales/nl-NL/grafana-prometheus.json |  38 ++
 .../src/locales/pl-PL/grafana-prometheus.json |  38 ++
 .../src/locales/pt-BR/grafana-prometheus.json |  38 ++
 .../src/locales/pt-PT/grafana-prometheus.json |  38 ++
 .../src/locales/ru-RU/grafana-prometheus.json |  38 ++
 .../src/locales/sv-SE/grafana-prometheus.json |  38 ++
 .../src/locales/tr-TR/grafana-prometheus.json |  38 ++
 .../locales/zh-Hans/grafana-prometheus.json   |  38 ++
 .../locales/zh-Hant/grafana-prometheus.json   |  38 ++
 .../src/locales/cs-CZ/grafana-sql.json        |   4 +
 .../src/locales/de-DE/grafana-sql.json        |   4 +
 .../src/locales/es-ES/grafana-sql.json        |   4 +
 .../src/locales/fr-FR/grafana-sql.json        |   4 +
 .../src/locales/hu-HU/grafana-sql.json        |   4 +
 .../src/locales/id-ID/grafana-sql.json        |   4 +
 .../src/locales/it-IT/grafana-sql.json        |   4 +
 .../src/locales/ja-JP/grafana-sql.json        |   4 +
 .../src/locales/ko-KR/grafana-sql.json        |   4 +
 .../src/locales/nl-NL/grafana-sql.json        |   4 +
 .../src/locales/pl-PL/grafana-sql.json        |   4 +
 .../src/locales/pt-BR/grafana-sql.json        |   4 +
 .../src/locales/pt-PT/grafana-sql.json        |   4 +
 .../src/locales/ru-RU/grafana-sql.json        |   4 +
 .../src/locales/sv-SE/grafana-sql.json        |   4 +
 .../src/locales/tr-TR/grafana-sql.json        |   4 +
 .../src/locales/zh-Hans/grafana-sql.json      |   4 +
 .../src/locales/zh-Hant/grafana-sql.json      |   4 +
 .../grafana-azure-monitor-datasource.json     |  10 +
 .../grafana-azure-monitor-datasource.json     |  10 +
 .../grafana-azure-monitor-datasource.json     |  10 +
 .../grafana-azure-monitor-datasource.json     |  10 +
 .../grafana-azure-monitor-datasource.json     |  10 +
 .../grafana-azure-monitor-datasource.json     |  10 +
 .../grafana-azure-monitor-datasource.json     |  10 +
 .../grafana-azure-monitor-datasource.json     |  10 +
 .../grafana-azure-monitor-datasource.json     |  10 +
 .../grafana-azure-monitor-datasource.json     |  10 +
 .../grafana-azure-monitor-datasource.json     |  10 +
 .../grafana-azure-monitor-datasource.json     |  10 +
 .../grafana-azure-monitor-datasource.json     |  10 +
 .../grafana-azure-monitor-datasource.json     |  10 +
 .../grafana-azure-monitor-datasource.json     |  10 +
 .../grafana-azure-monitor-datasource.json     |  10 +
 .../grafana-azure-monitor-datasource.json     |  10 +
 .../grafana-azure-monitor-datasource.json     |  10 +
 public/locales/cs-CZ/grafana.json             | 409 +++++++++++++++--
 public/locales/de-DE/grafana.json             | 403 ++++++++++++++++-
 public/locales/es-ES/grafana.json             | 407 +++++++++++++++--
 public/locales/fr-FR/grafana.json             | 407 +++++++++++++++--
 public/locales/hu-HU/grafana.json             | 399 ++++++++++++++++-
 public/locales/id-ID/grafana.json             | 398 ++++++++++++++++-
 public/locales/it-IT/grafana.json             | 415 ++++++++++++++++--
 public/locales/ja-JP/grafana.json             | 398 ++++++++++++++++-
 public/locales/ko-KR/grafana.json             | 398 ++++++++++++++++-
 public/locales/nl-NL/grafana.json             | 407 +++++++++++++++--
 public/locales/pl-PL/grafana.json             | 411 +++++++++++++++--
 public/locales/pt-BR/grafana.json             | 407 +++++++++++++++--
 public/locales/pt-PT/grafana.json             | 407 +++++++++++++++--
 public/locales/ru-RU/grafana.json             | 415 ++++++++++++++++--
 public/locales/sv-SE/grafana.json             | 407 +++++++++++++++--
 public/locales/tr-TR/grafana.json             | 399 ++++++++++++++++-
 public/locales/zh-Hans/grafana.json           | 398 ++++++++++++++++-
 public/locales/zh-Hant/grafana.json           | 398 ++++++++++++++++-
 72 files changed, 7773 insertions(+), 446 deletions(-)

diff --git a/packages/grafana-prometheus/src/locales/cs-CZ/grafana-prometheus.json b/packages/grafana-prometheus/src/locales/cs-CZ/grafana-prometheus.json
index 97bd700ee53..3807aa13ec1 100644
--- a/packages/grafana-prometheus/src/locales/cs-CZ/grafana-prometheus.json
+++ b/packages/grafana-prometheus/src/locales/cs-CZ/grafana-prometheus.json
@@ -157,6 +157,10 @@
         "aria-label-prom-type-type": "",
         "aria-label-prometheus-type": "",
         "aria-label-select-http-method": "",
+        "editor-options": {
+          "label-builder": "",
+          "label-code": ""
+        },
         "label-cache-level": "",
         "label-custom-query-parameters": "",
         "label-default-editor": "",
@@ -195,6 +199,16 @@
         "tooltip-use-series-endpoint": ""
       }
     },
+    "prom-query-legend-editor": {
+      "get-legend-mode-options": {
+        "description-auto": "",
+        "description-custom": "",
+        "description-verbose": "",
+        "label-auto": "",
+        "label-custom": "",
+        "label-verbose": ""
+      }
+    },
     "querybuilder": {
       "additional-settings": {
         "content-filter-metric-names-regex-search-using": "",
@@ -204,6 +218,13 @@
         "give-feedback": "Poskytnout zpětnou vazbu",
         "title-give-feedback": ""
       },
+      "get-collapsed-info": {
+        "exemplars": "",
+        "format": "",
+        "legend": "",
+        "step": "",
+        "type": ""
+      },
       "handle-function": {
         "text": {
           "query-parsing-is-ambiguous": ""
@@ -219,6 +240,10 @@
         "label-label-filters": "",
         "tooltip-label-filters": ""
       },
+      "label-param-editor": {
+        "loadingMessage-loading-labels": "",
+        "noOptionsMessage-no-labels-found": ""
+      },
       "metric-combobox": {
         "async-select": {
           "aria-label-open-metrics-explorer": "",
@@ -276,6 +301,11 @@
       "prom-query-builder-options": {
         "aria-label-lower-limit-parameter": "",
         "aria-label-select-resolution": "",
+        "format-options": {
+          "label-heatmap": "",
+          "label-table": "",
+          "label-time-series": ""
+        },
         "label-exemplars": "",
         "label-format": "Formát",
         "label-min-step": "",
@@ -290,6 +320,8 @@
         "tooltip-autocomplete-suggestions-limited": ""
       },
       "prom-query-editor-selector": {
+        "body-syntax-error": "",
+        "confirmText-continue": "",
         "kick-start-your-query": "Spustit dotaz",
         "label-explain": "",
         "run-queries": "",
@@ -306,6 +338,12 @@
       "query-editor-hints": {
         "hint-details": ""
       },
+      "query-editor-mode-toggle": {
+        "editor-modes": {
+          "label-builder": "",
+          "label-code": ""
+        }
+      },
       "query-pattern": {
         "apply-query": "",
         "aria-label-apply-query-starter-button": "",
diff --git a/packages/grafana-prometheus/src/locales/de-DE/grafana-prometheus.json b/packages/grafana-prometheus/src/locales/de-DE/grafana-prometheus.json
index b2a62f0ced1..80d301b1e4e 100644
--- a/packages/grafana-prometheus/src/locales/de-DE/grafana-prometheus.json
+++ b/packages/grafana-prometheus/src/locales/de-DE/grafana-prometheus.json
@@ -157,6 +157,10 @@
         "aria-label-prom-type-type": "",
         "aria-label-prometheus-type": "",
         "aria-label-select-http-method": "",
+        "editor-options": {
+          "label-builder": "",
+          "label-code": ""
+        },
         "label-cache-level": "",
         "label-custom-query-parameters": "",
         "label-default-editor": "",
@@ -195,6 +199,16 @@
         "tooltip-use-series-endpoint": ""
       }
     },
+    "prom-query-legend-editor": {
+      "get-legend-mode-options": {
+        "description-auto": "",
+        "description-custom": "",
+        "description-verbose": "",
+        "label-auto": "",
+        "label-custom": "",
+        "label-verbose": ""
+      }
+    },
     "querybuilder": {
       "additional-settings": {
         "content-filter-metric-names-regex-search-using": "",
@@ -204,6 +218,13 @@
         "give-feedback": "Feedback geben",
         "title-give-feedback": ""
       },
+      "get-collapsed-info": {
+        "exemplars": "",
+        "format": "",
+        "legend": "",
+        "step": "",
+        "type": ""
+      },
       "handle-function": {
         "text": {
           "query-parsing-is-ambiguous": ""
@@ -219,6 +240,10 @@
         "label-label-filters": "",
         "tooltip-label-filters": ""
       },
+      "label-param-editor": {
+        "loadingMessage-loading-labels": "",
+        "noOptionsMessage-no-labels-found": ""
+      },
       "metric-combobox": {
         "async-select": {
           "aria-label-open-metrics-explorer": "",
@@ -274,6 +299,11 @@
       "prom-query-builder-options": {
         "aria-label-lower-limit-parameter": "",
         "aria-label-select-resolution": "",
+        "format-options": {
+          "label-heatmap": "",
+          "label-table": "",
+          "label-time-series": ""
+        },
         "label-exemplars": "",
         "label-format": "Format",
         "label-min-step": "",
@@ -288,6 +318,8 @@
         "tooltip-autocomplete-suggestions-limited": ""
       },
       "prom-query-editor-selector": {
+        "body-syntax-error": "",
+        "confirmText-continue": "",
         "kick-start-your-query": "Starten Sie Ihre Abfrage",
         "label-explain": "",
         "run-queries": "",
@@ -304,6 +336,12 @@
       "query-editor-hints": {
         "hint-details": ""
       },
+      "query-editor-mode-toggle": {
+        "editor-modes": {
+          "label-builder": "",
+          "label-code": ""
+        }
+      },
       "query-pattern": {
         "apply-query": "",
         "aria-label-apply-query-starter-button": "",
diff --git a/packages/grafana-prometheus/src/locales/es-ES/grafana-prometheus.json b/packages/grafana-prometheus/src/locales/es-ES/grafana-prometheus.json
index 2cfb484899d..5fb2ff31407 100644
--- a/packages/grafana-prometheus/src/locales/es-ES/grafana-prometheus.json
+++ b/packages/grafana-prometheus/src/locales/es-ES/grafana-prometheus.json
@@ -157,6 +157,10 @@
         "aria-label-prom-type-type": "",
         "aria-label-prometheus-type": "",
         "aria-label-select-http-method": "",
+        "editor-options": {
+          "label-builder": "",
+          "label-code": ""
+        },
         "label-cache-level": "",
         "label-custom-query-parameters": "",
         "label-default-editor": "",
@@ -195,6 +199,16 @@
         "tooltip-use-series-endpoint": ""
       }
     },
+    "prom-query-legend-editor": {
+      "get-legend-mode-options": {
+        "description-auto": "",
+        "description-custom": "",
+        "description-verbose": "",
+        "label-auto": "",
+        "label-custom": "",
+        "label-verbose": ""
+      }
+    },
     "querybuilder": {
       "additional-settings": {
         "content-filter-metric-names-regex-search-using": "",
@@ -204,6 +218,13 @@
         "give-feedback": "Enviar comentarios",
         "title-give-feedback": ""
       },
+      "get-collapsed-info": {
+        "exemplars": "",
+        "format": "",
+        "legend": "",
+        "step": "",
+        "type": ""
+      },
       "handle-function": {
         "text": {
           "query-parsing-is-ambiguous": ""
@@ -219,6 +240,10 @@
         "label-label-filters": "",
         "tooltip-label-filters": ""
       },
+      "label-param-editor": {
+        "loadingMessage-loading-labels": "",
+        "noOptionsMessage-no-labels-found": ""
+      },
       "metric-combobox": {
         "async-select": {
           "aria-label-open-metrics-explorer": "",
@@ -274,6 +299,11 @@
       "prom-query-builder-options": {
         "aria-label-lower-limit-parameter": "",
         "aria-label-select-resolution": "",
+        "format-options": {
+          "label-heatmap": "",
+          "label-table": "",
+          "label-time-series": ""
+        },
         "label-exemplars": "",
         "label-format": "Formato",
         "label-min-step": "",
@@ -288,6 +318,8 @@
         "tooltip-autocomplete-suggestions-limited": ""
       },
       "prom-query-editor-selector": {
+        "body-syntax-error": "",
+        "confirmText-continue": "",
         "kick-start-your-query": "Inicie su consulta",
         "label-explain": "",
         "run-queries": "",
@@ -304,6 +336,12 @@
       "query-editor-hints": {
         "hint-details": ""
       },
+      "query-editor-mode-toggle": {
+        "editor-modes": {
+          "label-builder": "",
+          "label-code": ""
+        }
+      },
       "query-pattern": {
         "apply-query": "",
         "aria-label-apply-query-starter-button": "",
diff --git a/packages/grafana-prometheus/src/locales/fr-FR/grafana-prometheus.json b/packages/grafana-prometheus/src/locales/fr-FR/grafana-prometheus.json
index 3d8d947716d..18b2b45ccb6 100644
--- a/packages/grafana-prometheus/src/locales/fr-FR/grafana-prometheus.json
+++ b/packages/grafana-prometheus/src/locales/fr-FR/grafana-prometheus.json
@@ -157,6 +157,10 @@
         "aria-label-prom-type-type": "",
         "aria-label-prometheus-type": "",
         "aria-label-select-http-method": "",
+        "editor-options": {
+          "label-builder": "",
+          "label-code": ""
+        },
         "label-cache-level": "",
         "label-custom-query-parameters": "",
         "label-default-editor": "",
@@ -195,6 +199,16 @@
         "tooltip-use-series-endpoint": ""
       }
     },
+    "prom-query-legend-editor": {
+      "get-legend-mode-options": {
+        "description-auto": "",
+        "description-custom": "",
+        "description-verbose": "",
+        "label-auto": "",
+        "label-custom": "",
+        "label-verbose": ""
+      }
+    },
     "querybuilder": {
       "additional-settings": {
         "content-filter-metric-names-regex-search-using": "",
@@ -204,6 +218,13 @@
         "give-feedback": "Publiez votre commentaire",
         "title-give-feedback": ""
       },
+      "get-collapsed-info": {
+        "exemplars": "",
+        "format": "",
+        "legend": "",
+        "step": "",
+        "type": ""
+      },
       "handle-function": {
         "text": {
           "query-parsing-is-ambiguous": ""
@@ -219,6 +240,10 @@
         "label-label-filters": "",
         "tooltip-label-filters": ""
       },
+      "label-param-editor": {
+        "loadingMessage-loading-labels": "",
+        "noOptionsMessage-no-labels-found": ""
+      },
       "metric-combobox": {
         "async-select": {
           "aria-label-open-metrics-explorer": "",
@@ -274,6 +299,11 @@
       "prom-query-builder-options": {
         "aria-label-lower-limit-parameter": "",
         "aria-label-select-resolution": "",
+        "format-options": {
+          "label-heatmap": "",
+          "label-table": "",
+          "label-time-series": ""
+        },
         "label-exemplars": "",
         "label-format": "Format",
         "label-min-step": "",
@@ -288,6 +318,8 @@
         "tooltip-autocomplete-suggestions-limited": ""
       },
       "prom-query-editor-selector": {
+        "body-syntax-error": "",
+        "confirmText-continue": "",
         "kick-start-your-query": "Lancer votre requête",
         "label-explain": "",
         "run-queries": "",
@@ -304,6 +336,12 @@
       "query-editor-hints": {
         "hint-details": ""
       },
+      "query-editor-mode-toggle": {
+        "editor-modes": {
+          "label-builder": "",
+          "label-code": ""
+        }
+      },
       "query-pattern": {
         "apply-query": "",
         "aria-label-apply-query-starter-button": "",
diff --git a/packages/grafana-prometheus/src/locales/hu-HU/grafana-prometheus.json b/packages/grafana-prometheus/src/locales/hu-HU/grafana-prometheus.json
index fb93de301a0..ad42c10c8f5 100644
--- a/packages/grafana-prometheus/src/locales/hu-HU/grafana-prometheus.json
+++ b/packages/grafana-prometheus/src/locales/hu-HU/grafana-prometheus.json
@@ -157,6 +157,10 @@
         "aria-label-prom-type-type": "",
         "aria-label-prometheus-type": "",
         "aria-label-select-http-method": "",
+        "editor-options": {
+          "label-builder": "",
+          "label-code": ""
+        },
         "label-cache-level": "",
         "label-custom-query-parameters": "",
         "label-default-editor": "",
@@ -195,6 +199,16 @@
         "tooltip-use-series-endpoint": ""
       }
     },
+    "prom-query-legend-editor": {
+      "get-legend-mode-options": {
+        "description-auto": "",
+        "description-custom": "",
+        "description-verbose": "",
+        "label-auto": "",
+        "label-custom": "",
+        "label-verbose": ""
+      }
+    },
     "querybuilder": {
       "additional-settings": {
         "content-filter-metric-names-regex-search-using": "",
@@ -204,6 +218,13 @@
         "give-feedback": "Visszajelzés küldése",
         "title-give-feedback": ""
       },
+      "get-collapsed-info": {
+        "exemplars": "",
+        "format": "",
+        "legend": "",
+        "step": "",
+        "type": ""
+      },
       "handle-function": {
         "text": {
           "query-parsing-is-ambiguous": ""
@@ -219,6 +240,10 @@
         "label-label-filters": "",
         "tooltip-label-filters": ""
       },
+      "label-param-editor": {
+        "loadingMessage-loading-labels": "",
+        "noOptionsMessage-no-labels-found": ""
+      },
       "metric-combobox": {
         "async-select": {
           "aria-label-open-metrics-explorer": "",
@@ -274,6 +299,11 @@
       "prom-query-builder-options": {
         "aria-label-lower-limit-parameter": "",
         "aria-label-select-resolution": "",
+        "format-options": {
+          "label-heatmap": "",
+          "label-table": "",
+          "label-time-series": ""
+        },
         "label-exemplars": "",
         "label-format": "Formátum",
         "label-min-step": "",
@@ -288,6 +318,8 @@
         "tooltip-autocomplete-suggestions-limited": ""
       },
       "prom-query-editor-selector": {
+        "body-syntax-error": "",
+        "confirmText-continue": "",
         "kick-start-your-query": "Előbeállításos lekérdezés",
         "label-explain": "",
         "run-queries": "",
@@ -304,6 +336,12 @@
       "query-editor-hints": {
         "hint-details": ""
       },
+      "query-editor-mode-toggle": {
+        "editor-modes": {
+          "label-builder": "",
+          "label-code": ""
+        }
+      },
       "query-pattern": {
         "apply-query": "",
         "aria-label-apply-query-starter-button": "",
diff --git a/packages/grafana-prometheus/src/locales/id-ID/grafana-prometheus.json b/packages/grafana-prometheus/src/locales/id-ID/grafana-prometheus.json
index efb21274cbd..fe28a159976 100644
--- a/packages/grafana-prometheus/src/locales/id-ID/grafana-prometheus.json
+++ b/packages/grafana-prometheus/src/locales/id-ID/grafana-prometheus.json
@@ -157,6 +157,10 @@
         "aria-label-prom-type-type": "",
         "aria-label-prometheus-type": "",
         "aria-label-select-http-method": "",
+        "editor-options": {
+          "label-builder": "",
+          "label-code": ""
+        },
         "label-cache-level": "",
         "label-custom-query-parameters": "",
         "label-default-editor": "",
@@ -195,6 +199,16 @@
         "tooltip-use-series-endpoint": ""
       }
     },
+    "prom-query-legend-editor": {
+      "get-legend-mode-options": {
+        "description-auto": "",
+        "description-custom": "",
+        "description-verbose": "",
+        "label-auto": "",
+        "label-custom": "",
+        "label-verbose": ""
+      }
+    },
     "querybuilder": {
       "additional-settings": {
         "content-filter-metric-names-regex-search-using": "",
@@ -204,6 +218,13 @@
         "give-feedback": "Berikan umpan balik",
         "title-give-feedback": ""
       },
+      "get-collapsed-info": {
+        "exemplars": "",
+        "format": "",
+        "legend": "",
+        "step": "",
+        "type": ""
+      },
       "handle-function": {
         "text": {
           "query-parsing-is-ambiguous": ""
@@ -219,6 +240,10 @@
         "label-label-filters": "",
         "tooltip-label-filters": ""
       },
+      "label-param-editor": {
+        "loadingMessage-loading-labels": "",
+        "noOptionsMessage-no-labels-found": ""
+      },
       "metric-combobox": {
         "async-select": {
           "aria-label-open-metrics-explorer": "",
@@ -273,6 +298,11 @@
       "prom-query-builder-options": {
         "aria-label-lower-limit-parameter": "",
         "aria-label-select-resolution": "",
+        "format-options": {
+          "label-heatmap": "",
+          "label-table": "",
+          "label-time-series": ""
+        },
         "label-exemplars": "",
         "label-format": "Format",
         "label-min-step": "",
@@ -287,6 +317,8 @@
         "tooltip-autocomplete-suggestions-limited": ""
       },
       "prom-query-editor-selector": {
+        "body-syntax-error": "",
+        "confirmText-continue": "",
         "kick-start-your-query": "Mulai kueri Anda",
         "label-explain": "",
         "run-queries": "",
@@ -303,6 +335,12 @@
       "query-editor-hints": {
         "hint-details": ""
       },
+      "query-editor-mode-toggle": {
+        "editor-modes": {
+          "label-builder": "",
+          "label-code": ""
+        }
+      },
       "query-pattern": {
         "apply-query": "",
         "aria-label-apply-query-starter-button": "",
diff --git a/packages/grafana-prometheus/src/locales/it-IT/grafana-prometheus.json b/packages/grafana-prometheus/src/locales/it-IT/grafana-prometheus.json
index 43fb6ff60a7..899ef0de61e 100644
--- a/packages/grafana-prometheus/src/locales/it-IT/grafana-prometheus.json
+++ b/packages/grafana-prometheus/src/locales/it-IT/grafana-prometheus.json
@@ -157,6 +157,10 @@
         "aria-label-prom-type-type": "",
         "aria-label-prometheus-type": "",
         "aria-label-select-http-method": "",
+        "editor-options": {
+          "label-builder": "",
+          "label-code": ""
+        },
         "label-cache-level": "",
         "label-custom-query-parameters": "",
         "label-default-editor": "",
@@ -195,6 +199,16 @@
         "tooltip-use-series-endpoint": ""
       }
     },
+    "prom-query-legend-editor": {
+      "get-legend-mode-options": {
+        "description-auto": "",
+        "description-custom": "",
+        "description-verbose": "",
+        "label-auto": "",
+        "label-custom": "",
+        "label-verbose": ""
+      }
+    },
     "querybuilder": {
       "additional-settings": {
         "content-filter-metric-names-regex-search-using": "",
@@ -204,6 +218,13 @@
         "give-feedback": "Lascia un feedback",
         "title-give-feedback": ""
       },
+      "get-collapsed-info": {
+        "exemplars": "",
+        "format": "",
+        "legend": "",
+        "step": "",
+        "type": ""
+      },
       "handle-function": {
         "text": {
           "query-parsing-is-ambiguous": ""
@@ -219,6 +240,10 @@
         "label-label-filters": "",
         "tooltip-label-filters": ""
       },
+      "label-param-editor": {
+        "loadingMessage-loading-labels": "",
+        "noOptionsMessage-no-labels-found": ""
+      },
       "metric-combobox": {
         "async-select": {
           "aria-label-open-metrics-explorer": "",
@@ -274,6 +299,11 @@
       "prom-query-builder-options": {
         "aria-label-lower-limit-parameter": "",
         "aria-label-select-resolution": "",
+        "format-options": {
+          "label-heatmap": "",
+          "label-table": "",
+          "label-time-series": ""
+        },
         "label-exemplars": "",
         "label-format": "Formato",
         "label-min-step": "",
@@ -288,6 +318,8 @@
         "tooltip-autocomplete-suggestions-limited": ""
       },
       "prom-query-editor-selector": {
+        "body-syntax-error": "",
+        "confirmText-continue": "",
         "kick-start-your-query": "Avvia la query",
         "label-explain": "",
         "run-queries": "",
@@ -304,6 +336,12 @@
       "query-editor-hints": {
         "hint-details": ""
       },
+      "query-editor-mode-toggle": {
+        "editor-modes": {
+          "label-builder": "",
+          "label-code": ""
+        }
+      },
       "query-pattern": {
         "apply-query": "",
         "aria-label-apply-query-starter-button": "",
diff --git a/packages/grafana-prometheus/src/locales/ja-JP/grafana-prometheus.json b/packages/grafana-prometheus/src/locales/ja-JP/grafana-prometheus.json
index f9560e7c3a3..9403559fe59 100644
--- a/packages/grafana-prometheus/src/locales/ja-JP/grafana-prometheus.json
+++ b/packages/grafana-prometheus/src/locales/ja-JP/grafana-prometheus.json
@@ -157,6 +157,10 @@
         "aria-label-prom-type-type": "",
         "aria-label-prometheus-type": "",
         "aria-label-select-http-method": "",
+        "editor-options": {
+          "label-builder": "",
+          "label-code": ""
+        },
         "label-cache-level": "",
         "label-custom-query-parameters": "",
         "label-default-editor": "",
@@ -195,6 +199,16 @@
         "tooltip-use-series-endpoint": ""
       }
     },
+    "prom-query-legend-editor": {
+      "get-legend-mode-options": {
+        "description-auto": "",
+        "description-custom": "",
+        "description-verbose": "",
+        "label-auto": "",
+        "label-custom": "",
+        "label-verbose": ""
+      }
+    },
     "querybuilder": {
       "additional-settings": {
         "content-filter-metric-names-regex-search-using": "",
@@ -204,6 +218,13 @@
         "give-feedback": "フィードバックを送信",
         "title-give-feedback": ""
       },
+      "get-collapsed-info": {
+        "exemplars": "",
+        "format": "",
+        "legend": "",
+        "step": "",
+        "type": ""
+      },
       "handle-function": {
         "text": {
           "query-parsing-is-ambiguous": ""
@@ -219,6 +240,10 @@
         "label-label-filters": "",
         "tooltip-label-filters": ""
       },
+      "label-param-editor": {
+        "loadingMessage-loading-labels": "",
+        "noOptionsMessage-no-labels-found": ""
+      },
       "metric-combobox": {
         "async-select": {
           "aria-label-open-metrics-explorer": "",
@@ -273,6 +298,11 @@
       "prom-query-builder-options": {
         "aria-label-lower-limit-parameter": "",
         "aria-label-select-resolution": "",
+        "format-options": {
+          "label-heatmap": "",
+          "label-table": "",
+          "label-time-series": ""
+        },
         "label-exemplars": "",
         "label-format": "形式",
         "label-min-step": "",
@@ -287,6 +317,8 @@
         "tooltip-autocomplete-suggestions-limited": ""
       },
       "prom-query-editor-selector": {
+        "body-syntax-error": "",
+        "confirmText-continue": "",
         "kick-start-your-query": "クエリを開始",
         "label-explain": "",
         "run-queries": "",
@@ -303,6 +335,12 @@
       "query-editor-hints": {
         "hint-details": ""
       },
+      "query-editor-mode-toggle": {
+        "editor-modes": {
+          "label-builder": "",
+          "label-code": ""
+        }
+      },
       "query-pattern": {
         "apply-query": "",
         "aria-label-apply-query-starter-button": "",
diff --git a/packages/grafana-prometheus/src/locales/ko-KR/grafana-prometheus.json b/packages/grafana-prometheus/src/locales/ko-KR/grafana-prometheus.json
index c67caa63f50..d7d6b414cf3 100644
--- a/packages/grafana-prometheus/src/locales/ko-KR/grafana-prometheus.json
+++ b/packages/grafana-prometheus/src/locales/ko-KR/grafana-prometheus.json
@@ -157,6 +157,10 @@
         "aria-label-prom-type-type": "",
         "aria-label-prometheus-type": "",
         "aria-label-select-http-method": "",
+        "editor-options": {
+          "label-builder": "",
+          "label-code": ""
+        },
         "label-cache-level": "",
         "label-custom-query-parameters": "",
         "label-default-editor": "",
@@ -195,6 +199,16 @@
         "tooltip-use-series-endpoint": ""
       }
     },
+    "prom-query-legend-editor": {
+      "get-legend-mode-options": {
+        "description-auto": "",
+        "description-custom": "",
+        "description-verbose": "",
+        "label-auto": "",
+        "label-custom": "",
+        "label-verbose": ""
+      }
+    },
     "querybuilder": {
       "additional-settings": {
         "content-filter-metric-names-regex-search-using": "",
@@ -204,6 +218,13 @@
         "give-feedback": "피드백 제출하기",
         "title-give-feedback": ""
       },
+      "get-collapsed-info": {
+        "exemplars": "",
+        "format": "",
+        "legend": "",
+        "step": "",
+        "type": ""
+      },
       "handle-function": {
         "text": {
           "query-parsing-is-ambiguous": ""
@@ -219,6 +240,10 @@
         "label-label-filters": "",
         "tooltip-label-filters": ""
       },
+      "label-param-editor": {
+        "loadingMessage-loading-labels": "",
+        "noOptionsMessage-no-labels-found": ""
+      },
       "metric-combobox": {
         "async-select": {
           "aria-label-open-metrics-explorer": "",
@@ -273,6 +298,11 @@
       "prom-query-builder-options": {
         "aria-label-lower-limit-parameter": "",
         "aria-label-select-resolution": "",
+        "format-options": {
+          "label-heatmap": "",
+          "label-table": "",
+          "label-time-series": ""
+        },
         "label-exemplars": "",
         "label-format": "형식",
         "label-min-step": "",
@@ -287,6 +317,8 @@
         "tooltip-autocomplete-suggestions-limited": ""
       },
       "prom-query-editor-selector": {
+        "body-syntax-error": "",
+        "confirmText-continue": "",
         "kick-start-your-query": "쿼리 시작하기",
         "label-explain": "",
         "run-queries": "",
@@ -303,6 +335,12 @@
       "query-editor-hints": {
         "hint-details": ""
       },
+      "query-editor-mode-toggle": {
+        "editor-modes": {
+          "label-builder": "",
+          "label-code": ""
+        }
+      },
       "query-pattern": {
         "apply-query": "",
         "aria-label-apply-query-starter-button": "",
diff --git a/packages/grafana-prometheus/src/locales/nl-NL/grafana-prometheus.json b/packages/grafana-prometheus/src/locales/nl-NL/grafana-prometheus.json
index e25eaefff64..f0cd4f482ff 100644
--- a/packages/grafana-prometheus/src/locales/nl-NL/grafana-prometheus.json
+++ b/packages/grafana-prometheus/src/locales/nl-NL/grafana-prometheus.json
@@ -157,6 +157,10 @@
         "aria-label-prom-type-type": "",
         "aria-label-prometheus-type": "",
         "aria-label-select-http-method": "",
+        "editor-options": {
+          "label-builder": "",
+          "label-code": ""
+        },
         "label-cache-level": "",
         "label-custom-query-parameters": "",
         "label-default-editor": "",
@@ -195,6 +199,16 @@
         "tooltip-use-series-endpoint": ""
       }
     },
+    "prom-query-legend-editor": {
+      "get-legend-mode-options": {
+        "description-auto": "",
+        "description-custom": "",
+        "description-verbose": "",
+        "label-auto": "",
+        "label-custom": "",
+        "label-verbose": ""
+      }
+    },
     "querybuilder": {
       "additional-settings": {
         "content-filter-metric-names-regex-search-using": "",
@@ -204,6 +218,13 @@
         "give-feedback": "Feedback geven",
         "title-give-feedback": ""
       },
+      "get-collapsed-info": {
+        "exemplars": "",
+        "format": "",
+        "legend": "",
+        "step": "",
+        "type": ""
+      },
       "handle-function": {
         "text": {
           "query-parsing-is-ambiguous": ""
@@ -219,6 +240,10 @@
         "label-label-filters": "",
         "tooltip-label-filters": ""
       },
+      "label-param-editor": {
+        "loadingMessage-loading-labels": "",
+        "noOptionsMessage-no-labels-found": ""
+      },
       "metric-combobox": {
         "async-select": {
           "aria-label-open-metrics-explorer": "",
@@ -274,6 +299,11 @@
       "prom-query-builder-options": {
         "aria-label-lower-limit-parameter": "",
         "aria-label-select-resolution": "",
+        "format-options": {
+          "label-heatmap": "",
+          "label-table": "",
+          "label-time-series": ""
+        },
         "label-exemplars": "",
         "label-format": "Formaat",
         "label-min-step": "",
@@ -288,6 +318,8 @@
         "tooltip-autocomplete-suggestions-limited": ""
       },
       "prom-query-editor-selector": {
+        "body-syntax-error": "",
+        "confirmText-continue": "",
         "kick-start-your-query": "Start je query",
         "label-explain": "",
         "run-queries": "",
@@ -304,6 +336,12 @@
       "query-editor-hints": {
         "hint-details": ""
       },
+      "query-editor-mode-toggle": {
+        "editor-modes": {
+          "label-builder": "",
+          "label-code": ""
+        }
+      },
       "query-pattern": {
         "apply-query": "",
         "aria-label-apply-query-starter-button": "",
diff --git a/packages/grafana-prometheus/src/locales/pl-PL/grafana-prometheus.json b/packages/grafana-prometheus/src/locales/pl-PL/grafana-prometheus.json
index ad21fccdb5a..f31dab572ba 100644
--- a/packages/grafana-prometheus/src/locales/pl-PL/grafana-prometheus.json
+++ b/packages/grafana-prometheus/src/locales/pl-PL/grafana-prometheus.json
@@ -157,6 +157,10 @@
         "aria-label-prom-type-type": "",
         "aria-label-prometheus-type": "",
         "aria-label-select-http-method": "",
+        "editor-options": {
+          "label-builder": "",
+          "label-code": ""
+        },
         "label-cache-level": "",
         "label-custom-query-parameters": "",
         "label-default-editor": "",
@@ -195,6 +199,16 @@
         "tooltip-use-series-endpoint": ""
       }
     },
+    "prom-query-legend-editor": {
+      "get-legend-mode-options": {
+        "description-auto": "",
+        "description-custom": "",
+        "description-verbose": "",
+        "label-auto": "",
+        "label-custom": "",
+        "label-verbose": ""
+      }
+    },
     "querybuilder": {
       "additional-settings": {
         "content-filter-metric-names-regex-search-using": "",
@@ -204,6 +218,13 @@
         "give-feedback": "Przekaż opinię",
         "title-give-feedback": ""
       },
+      "get-collapsed-info": {
+        "exemplars": "",
+        "format": "",
+        "legend": "",
+        "step": "",
+        "type": ""
+      },
       "handle-function": {
         "text": {
           "query-parsing-is-ambiguous": ""
@@ -219,6 +240,10 @@
         "label-label-filters": "",
         "tooltip-label-filters": ""
       },
+      "label-param-editor": {
+        "loadingMessage-loading-labels": "",
+        "noOptionsMessage-no-labels-found": ""
+      },
       "metric-combobox": {
         "async-select": {
           "aria-label-open-metrics-explorer": "",
@@ -276,6 +301,11 @@
       "prom-query-builder-options": {
         "aria-label-lower-limit-parameter": "",
         "aria-label-select-resolution": "",
+        "format-options": {
+          "label-heatmap": "",
+          "label-table": "",
+          "label-time-series": ""
+        },
         "label-exemplars": "",
         "label-format": "Format",
         "label-min-step": "",
@@ -290,6 +320,8 @@
         "tooltip-autocomplete-suggestions-limited": ""
       },
       "prom-query-editor-selector": {
+        "body-syntax-error": "",
+        "confirmText-continue": "",
         "kick-start-your-query": "Uruchom zapytanie",
         "label-explain": "",
         "run-queries": "",
@@ -306,6 +338,12 @@
       "query-editor-hints": {
         "hint-details": ""
       },
+      "query-editor-mode-toggle": {
+        "editor-modes": {
+          "label-builder": "",
+          "label-code": ""
+        }
+      },
       "query-pattern": {
         "apply-query": "",
         "aria-label-apply-query-starter-button": "",
diff --git a/packages/grafana-prometheus/src/locales/pt-BR/grafana-prometheus.json b/packages/grafana-prometheus/src/locales/pt-BR/grafana-prometheus.json
index 81801a8c07d..3328d384500 100644
--- a/packages/grafana-prometheus/src/locales/pt-BR/grafana-prometheus.json
+++ b/packages/grafana-prometheus/src/locales/pt-BR/grafana-prometheus.json
@@ -157,6 +157,10 @@
         "aria-label-prom-type-type": "",
         "aria-label-prometheus-type": "",
         "aria-label-select-http-method": "",
+        "editor-options": {
+          "label-builder": "",
+          "label-code": ""
+        },
         "label-cache-level": "",
         "label-custom-query-parameters": "",
         "label-default-editor": "",
@@ -195,6 +199,16 @@
         "tooltip-use-series-endpoint": ""
       }
     },
+    "prom-query-legend-editor": {
+      "get-legend-mode-options": {
+        "description-auto": "",
+        "description-custom": "",
+        "description-verbose": "",
+        "label-auto": "",
+        "label-custom": "",
+        "label-verbose": ""
+      }
+    },
     "querybuilder": {
       "additional-settings": {
         "content-filter-metric-names-regex-search-using": "",
@@ -204,6 +218,13 @@
         "give-feedback": "Dar feedback",
         "title-give-feedback": ""
       },
+      "get-collapsed-info": {
+        "exemplars": "",
+        "format": "",
+        "legend": "",
+        "step": "",
+        "type": ""
+      },
       "handle-function": {
         "text": {
           "query-parsing-is-ambiguous": ""
@@ -219,6 +240,10 @@
         "label-label-filters": "",
         "tooltip-label-filters": ""
       },
+      "label-param-editor": {
+        "loadingMessage-loading-labels": "",
+        "noOptionsMessage-no-labels-found": ""
+      },
       "metric-combobox": {
         "async-select": {
           "aria-label-open-metrics-explorer": "",
@@ -274,6 +299,11 @@
       "prom-query-builder-options": {
         "aria-label-lower-limit-parameter": "",
         "aria-label-select-resolution": "",
+        "format-options": {
+          "label-heatmap": "",
+          "label-table": "",
+          "label-time-series": ""
+        },
         "label-exemplars": "",
         "label-format": "Formato",
         "label-min-step": "",
@@ -288,6 +318,8 @@
         "tooltip-autocomplete-suggestions-limited": ""
       },
       "prom-query-editor-selector": {
+        "body-syntax-error": "",
+        "confirmText-continue": "",
         "kick-start-your-query": "Iniciar sua consulta",
         "label-explain": "",
         "run-queries": "",
@@ -304,6 +336,12 @@
       "query-editor-hints": {
         "hint-details": ""
       },
+      "query-editor-mode-toggle": {
+        "editor-modes": {
+          "label-builder": "",
+          "label-code": ""
+        }
+      },
       "query-pattern": {
         "apply-query": "",
         "aria-label-apply-query-starter-button": "",
diff --git a/packages/grafana-prometheus/src/locales/pt-PT/grafana-prometheus.json b/packages/grafana-prometheus/src/locales/pt-PT/grafana-prometheus.json
index fcfd4a81bc0..df5a4f369fb 100644
--- a/packages/grafana-prometheus/src/locales/pt-PT/grafana-prometheus.json
+++ b/packages/grafana-prometheus/src/locales/pt-PT/grafana-prometheus.json
@@ -157,6 +157,10 @@
         "aria-label-prom-type-type": "",
         "aria-label-prometheus-type": "",
         "aria-label-select-http-method": "",
+        "editor-options": {
+          "label-builder": "",
+          "label-code": ""
+        },
         "label-cache-level": "",
         "label-custom-query-parameters": "",
         "label-default-editor": "",
@@ -195,6 +199,16 @@
         "tooltip-use-series-endpoint": ""
       }
     },
+    "prom-query-legend-editor": {
+      "get-legend-mode-options": {
+        "description-auto": "",
+        "description-custom": "",
+        "description-verbose": "",
+        "label-auto": "",
+        "label-custom": "",
+        "label-verbose": ""
+      }
+    },
     "querybuilder": {
       "additional-settings": {
         "content-filter-metric-names-regex-search-using": "",
@@ -204,6 +218,13 @@
         "give-feedback": "Dar feedback",
         "title-give-feedback": ""
       },
+      "get-collapsed-info": {
+        "exemplars": "",
+        "format": "",
+        "legend": "",
+        "step": "",
+        "type": ""
+      },
       "handle-function": {
         "text": {
           "query-parsing-is-ambiguous": ""
@@ -219,6 +240,10 @@
         "label-label-filters": "",
         "tooltip-label-filters": ""
       },
+      "label-param-editor": {
+        "loadingMessage-loading-labels": "",
+        "noOptionsMessage-no-labels-found": ""
+      },
       "metric-combobox": {
         "async-select": {
           "aria-label-open-metrics-explorer": "",
@@ -274,6 +299,11 @@
       "prom-query-builder-options": {
         "aria-label-lower-limit-parameter": "",
         "aria-label-select-resolution": "",
+        "format-options": {
+          "label-heatmap": "",
+          "label-table": "",
+          "label-time-series": ""
+        },
         "label-exemplars": "",
         "label-format": "Formato",
         "label-min-step": "",
@@ -288,6 +318,8 @@
         "tooltip-autocomplete-suggestions-limited": ""
       },
       "prom-query-editor-selector": {
+        "body-syntax-error": "",
+        "confirmText-continue": "",
         "kick-start-your-query": "Dê início à sua consulta",
         "label-explain": "",
         "run-queries": "",
@@ -304,6 +336,12 @@
       "query-editor-hints": {
         "hint-details": ""
       },
+      "query-editor-mode-toggle": {
+        "editor-modes": {
+          "label-builder": "",
+          "label-code": ""
+        }
+      },
       "query-pattern": {
         "apply-query": "",
         "aria-label-apply-query-starter-button": "",
diff --git a/packages/grafana-prometheus/src/locales/ru-RU/grafana-prometheus.json b/packages/grafana-prometheus/src/locales/ru-RU/grafana-prometheus.json
index 6524e3464eb..b39e794a2cb 100644
--- a/packages/grafana-prometheus/src/locales/ru-RU/grafana-prometheus.json
+++ b/packages/grafana-prometheus/src/locales/ru-RU/grafana-prometheus.json
@@ -157,6 +157,10 @@
         "aria-label-prom-type-type": "",
         "aria-label-prometheus-type": "",
         "aria-label-select-http-method": "",
+        "editor-options": {
+          "label-builder": "",
+          "label-code": ""
+        },
         "label-cache-level": "",
         "label-custom-query-parameters": "",
         "label-default-editor": "",
@@ -195,6 +199,16 @@
         "tooltip-use-series-endpoint": ""
       }
     },
+    "prom-query-legend-editor": {
+      "get-legend-mode-options": {
+        "description-auto": "",
+        "description-custom": "",
+        "description-verbose": "",
+        "label-auto": "",
+        "label-custom": "",
+        "label-verbose": ""
+      }
+    },
     "querybuilder": {
       "additional-settings": {
         "content-filter-metric-names-regex-search-using": "",
@@ -204,6 +218,13 @@
         "give-feedback": "Отправить отзыв",
         "title-give-feedback": ""
       },
+      "get-collapsed-info": {
+        "exemplars": "",
+        "format": "",
+        "legend": "",
+        "step": "",
+        "type": ""
+      },
       "handle-function": {
         "text": {
           "query-parsing-is-ambiguous": ""
@@ -219,6 +240,10 @@
         "label-label-filters": "",
         "tooltip-label-filters": ""
       },
+      "label-param-editor": {
+        "loadingMessage-loading-labels": "",
+        "noOptionsMessage-no-labels-found": ""
+      },
       "metric-combobox": {
         "async-select": {
           "aria-label-open-metrics-explorer": "",
@@ -276,6 +301,11 @@
       "prom-query-builder-options": {
         "aria-label-lower-limit-parameter": "",
         "aria-label-select-resolution": "",
+        "format-options": {
+          "label-heatmap": "",
+          "label-table": "",
+          "label-time-series": ""
+        },
         "label-exemplars": "",
         "label-format": "Формат",
         "label-min-step": "",
@@ -290,6 +320,8 @@
         "tooltip-autocomplete-suggestions-limited": ""
       },
       "prom-query-editor-selector": {
+        "body-syntax-error": "",
+        "confirmText-continue": "",
         "kick-start-your-query": "Запустить запрос",
         "label-explain": "",
         "run-queries": "",
@@ -306,6 +338,12 @@
       "query-editor-hints": {
         "hint-details": ""
       },
+      "query-editor-mode-toggle": {
+        "editor-modes": {
+          "label-builder": "",
+          "label-code": ""
+        }
+      },
       "query-pattern": {
         "apply-query": "",
         "aria-label-apply-query-starter-button": "",
diff --git a/packages/grafana-prometheus/src/locales/sv-SE/grafana-prometheus.json b/packages/grafana-prometheus/src/locales/sv-SE/grafana-prometheus.json
index eff0092cdb4..77ba65213b5 100644
--- a/packages/grafana-prometheus/src/locales/sv-SE/grafana-prometheus.json
+++ b/packages/grafana-prometheus/src/locales/sv-SE/grafana-prometheus.json
@@ -157,6 +157,10 @@
         "aria-label-prom-type-type": "",
         "aria-label-prometheus-type": "",
         "aria-label-select-http-method": "",
+        "editor-options": {
+          "label-builder": "",
+          "label-code": ""
+        },
         "label-cache-level": "",
         "label-custom-query-parameters": "",
         "label-default-editor": "",
@@ -195,6 +199,16 @@
         "tooltip-use-series-endpoint": ""
       }
     },
+    "prom-query-legend-editor": {
+      "get-legend-mode-options": {
+        "description-auto": "",
+        "description-custom": "",
+        "description-verbose": "",
+        "label-auto": "",
+        "label-custom": "",
+        "label-verbose": ""
+      }
+    },
     "querybuilder": {
       "additional-settings": {
         "content-filter-metric-names-regex-search-using": "",
@@ -204,6 +218,13 @@
         "give-feedback": "Ge feedback",
         "title-give-feedback": ""
       },
+      "get-collapsed-info": {
+        "exemplars": "",
+        "format": "",
+        "legend": "",
+        "step": "",
+        "type": ""
+      },
       "handle-function": {
         "text": {
           "query-parsing-is-ambiguous": ""
@@ -219,6 +240,10 @@
         "label-label-filters": "",
         "tooltip-label-filters": ""
       },
+      "label-param-editor": {
+        "loadingMessage-loading-labels": "",
+        "noOptionsMessage-no-labels-found": ""
+      },
       "metric-combobox": {
         "async-select": {
           "aria-label-open-metrics-explorer": "",
@@ -274,6 +299,11 @@
       "prom-query-builder-options": {
         "aria-label-lower-limit-parameter": "",
         "aria-label-select-resolution": "",
+        "format-options": {
+          "label-heatmap": "",
+          "label-table": "",
+          "label-time-series": ""
+        },
         "label-exemplars": "",
         "label-format": "Format",
         "label-min-step": "",
@@ -288,6 +318,8 @@
         "tooltip-autocomplete-suggestions-limited": ""
       },
       "prom-query-editor-selector": {
+        "body-syntax-error": "",
+        "confirmText-continue": "",
         "kick-start-your-query": "Kickstarta din fråga",
         "label-explain": "",
         "run-queries": "",
@@ -304,6 +336,12 @@
       "query-editor-hints": {
         "hint-details": ""
       },
+      "query-editor-mode-toggle": {
+        "editor-modes": {
+          "label-builder": "",
+          "label-code": ""
+        }
+      },
       "query-pattern": {
         "apply-query": "",
         "aria-label-apply-query-starter-button": "",
diff --git a/packages/grafana-prometheus/src/locales/tr-TR/grafana-prometheus.json b/packages/grafana-prometheus/src/locales/tr-TR/grafana-prometheus.json
index f1cc39bb7ef..651184ce148 100644
--- a/packages/grafana-prometheus/src/locales/tr-TR/grafana-prometheus.json
+++ b/packages/grafana-prometheus/src/locales/tr-TR/grafana-prometheus.json
@@ -157,6 +157,10 @@
         "aria-label-prom-type-type": "",
         "aria-label-prometheus-type": "",
         "aria-label-select-http-method": "",
+        "editor-options": {
+          "label-builder": "",
+          "label-code": ""
+        },
         "label-cache-level": "",
         "label-custom-query-parameters": "",
         "label-default-editor": "",
@@ -195,6 +199,16 @@
         "tooltip-use-series-endpoint": ""
       }
     },
+    "prom-query-legend-editor": {
+      "get-legend-mode-options": {
+        "description-auto": "",
+        "description-custom": "",
+        "description-verbose": "",
+        "label-auto": "",
+        "label-custom": "",
+        "label-verbose": ""
+      }
+    },
     "querybuilder": {
       "additional-settings": {
         "content-filter-metric-names-regex-search-using": "",
@@ -204,6 +218,13 @@
         "give-feedback": "Geri bildirim gönder",
         "title-give-feedback": ""
       },
+      "get-collapsed-info": {
+        "exemplars": "",
+        "format": "",
+        "legend": "",
+        "step": "",
+        "type": ""
+      },
       "handle-function": {
         "text": {
           "query-parsing-is-ambiguous": ""
@@ -219,6 +240,10 @@
         "label-label-filters": "",
         "tooltip-label-filters": ""
       },
+      "label-param-editor": {
+        "loadingMessage-loading-labels": "",
+        "noOptionsMessage-no-labels-found": ""
+      },
       "metric-combobox": {
         "async-select": {
           "aria-label-open-metrics-explorer": "",
@@ -274,6 +299,11 @@
       "prom-query-builder-options": {
         "aria-label-lower-limit-parameter": "",
         "aria-label-select-resolution": "",
+        "format-options": {
+          "label-heatmap": "",
+          "label-table": "",
+          "label-time-series": ""
+        },
         "label-exemplars": "",
         "label-format": "Biçim",
         "label-min-step": "",
@@ -288,6 +318,8 @@
         "tooltip-autocomplete-suggestions-limited": ""
       },
       "prom-query-editor-selector": {
+        "body-syntax-error": "",
+        "confirmText-continue": "",
         "kick-start-your-query": "Sorgunuzu hızlı başlatın",
         "label-explain": "",
         "run-queries": "",
@@ -304,6 +336,12 @@
       "query-editor-hints": {
         "hint-details": ""
       },
+      "query-editor-mode-toggle": {
+        "editor-modes": {
+          "label-builder": "",
+          "label-code": ""
+        }
+      },
       "query-pattern": {
         "apply-query": "",
         "aria-label-apply-query-starter-button": "",
diff --git a/packages/grafana-prometheus/src/locales/zh-Hans/grafana-prometheus.json b/packages/grafana-prometheus/src/locales/zh-Hans/grafana-prometheus.json
index d5194ff8a10..228bf7c54c6 100644
--- a/packages/grafana-prometheus/src/locales/zh-Hans/grafana-prometheus.json
+++ b/packages/grafana-prometheus/src/locales/zh-Hans/grafana-prometheus.json
@@ -157,6 +157,10 @@
         "aria-label-prom-type-type": "",
         "aria-label-prometheus-type": "",
         "aria-label-select-http-method": "",
+        "editor-options": {
+          "label-builder": "",
+          "label-code": ""
+        },
         "label-cache-level": "",
         "label-custom-query-parameters": "",
         "label-default-editor": "",
@@ -195,6 +199,16 @@
         "tooltip-use-series-endpoint": ""
       }
     },
+    "prom-query-legend-editor": {
+      "get-legend-mode-options": {
+        "description-auto": "",
+        "description-custom": "",
+        "description-verbose": "",
+        "label-auto": "",
+        "label-custom": "",
+        "label-verbose": ""
+      }
+    },
     "querybuilder": {
       "additional-settings": {
         "content-filter-metric-names-regex-search-using": "",
@@ -204,6 +218,13 @@
         "give-feedback": "提供反馈",
         "title-give-feedback": ""
       },
+      "get-collapsed-info": {
+        "exemplars": "",
+        "format": "",
+        "legend": "",
+        "step": "",
+        "type": ""
+      },
       "handle-function": {
         "text": {
           "query-parsing-is-ambiguous": ""
@@ -219,6 +240,10 @@
         "label-label-filters": "",
         "tooltip-label-filters": ""
       },
+      "label-param-editor": {
+        "loadingMessage-loading-labels": "",
+        "noOptionsMessage-no-labels-found": ""
+      },
       "metric-combobox": {
         "async-select": {
           "aria-label-open-metrics-explorer": "",
@@ -273,6 +298,11 @@
       "prom-query-builder-options": {
         "aria-label-lower-limit-parameter": "",
         "aria-label-select-resolution": "",
+        "format-options": {
+          "label-heatmap": "",
+          "label-table": "",
+          "label-time-series": ""
+        },
         "label-exemplars": "",
         "label-format": "格式",
         "label-min-step": "",
@@ -287,6 +317,8 @@
         "tooltip-autocomplete-suggestions-limited": ""
       },
       "prom-query-editor-selector": {
+        "body-syntax-error": "",
+        "confirmText-continue": "",
         "kick-start-your-query": "启动您的查询",
         "label-explain": "",
         "run-queries": "",
@@ -303,6 +335,12 @@
       "query-editor-hints": {
         "hint-details": ""
       },
+      "query-editor-mode-toggle": {
+        "editor-modes": {
+          "label-builder": "",
+          "label-code": ""
+        }
+      },
       "query-pattern": {
         "apply-query": "",
         "aria-label-apply-query-starter-button": "",
diff --git a/packages/grafana-prometheus/src/locales/zh-Hant/grafana-prometheus.json b/packages/grafana-prometheus/src/locales/zh-Hant/grafana-prometheus.json
index 88d1bf2d1e5..c58d51a7708 100644
--- a/packages/grafana-prometheus/src/locales/zh-Hant/grafana-prometheus.json
+++ b/packages/grafana-prometheus/src/locales/zh-Hant/grafana-prometheus.json
@@ -157,6 +157,10 @@
         "aria-label-prom-type-type": "",
         "aria-label-prometheus-type": "",
         "aria-label-select-http-method": "",
+        "editor-options": {
+          "label-builder": "",
+          "label-code": ""
+        },
         "label-cache-level": "",
         "label-custom-query-parameters": "",
         "label-default-editor": "",
@@ -195,6 +199,16 @@
         "tooltip-use-series-endpoint": ""
       }
     },
+    "prom-query-legend-editor": {
+      "get-legend-mode-options": {
+        "description-auto": "",
+        "description-custom": "",
+        "description-verbose": "",
+        "label-auto": "",
+        "label-custom": "",
+        "label-verbose": ""
+      }
+    },
     "querybuilder": {
       "additional-settings": {
         "content-filter-metric-names-regex-search-using": "",
@@ -204,6 +218,13 @@
         "give-feedback": "提供意見回饋",
         "title-give-feedback": ""
       },
+      "get-collapsed-info": {
+        "exemplars": "",
+        "format": "",
+        "legend": "",
+        "step": "",
+        "type": ""
+      },
       "handle-function": {
         "text": {
           "query-parsing-is-ambiguous": ""
@@ -219,6 +240,10 @@
         "label-label-filters": "",
         "tooltip-label-filters": ""
       },
+      "label-param-editor": {
+        "loadingMessage-loading-labels": "",
+        "noOptionsMessage-no-labels-found": ""
+      },
       "metric-combobox": {
         "async-select": {
           "aria-label-open-metrics-explorer": "",
@@ -273,6 +298,11 @@
       "prom-query-builder-options": {
         "aria-label-lower-limit-parameter": "",
         "aria-label-select-resolution": "",
+        "format-options": {
+          "label-heatmap": "",
+          "label-table": "",
+          "label-time-series": ""
+        },
         "label-exemplars": "",
         "label-format": "格式",
         "label-min-step": "",
@@ -287,6 +317,8 @@
         "tooltip-autocomplete-suggestions-limited": ""
       },
       "prom-query-editor-selector": {
+        "body-syntax-error": "",
+        "confirmText-continue": "",
         "kick-start-your-query": "啟動您的查詢",
         "label-explain": "",
         "run-queries": "",
@@ -303,6 +335,12 @@
       "query-editor-hints": {
         "hint-details": ""
       },
+      "query-editor-mode-toggle": {
+        "editor-modes": {
+          "label-builder": "",
+          "label-code": ""
+        }
+      },
       "query-pattern": {
         "apply-query": "",
         "aria-label-apply-query-starter-button": "",
diff --git a/packages/grafana-sql/src/locales/cs-CZ/grafana-sql.json b/packages/grafana-sql/src/locales/cs-CZ/grafana-sql.json
index 52ab74544e9..ee03668f7c7 100644
--- a/packages/grafana-sql/src/locales/cs-CZ/grafana-sql.json
+++ b/packages/grafana-sql/src/locales/cs-CZ/grafana-sql.json
@@ -55,6 +55,10 @@
       },
       "query-header": {
         "content-invalid-query": "",
+        "editor-modes": {
+          "label-builder": "",
+          "label-code": ""
+        },
         "label-dataset": "",
         "label-filter": "Filtrovat",
         "label-format": "Formát",
diff --git a/packages/grafana-sql/src/locales/de-DE/grafana-sql.json b/packages/grafana-sql/src/locales/de-DE/grafana-sql.json
index 895927b7c1f..5f921f12dba 100644
--- a/packages/grafana-sql/src/locales/de-DE/grafana-sql.json
+++ b/packages/grafana-sql/src/locales/de-DE/grafana-sql.json
@@ -55,6 +55,10 @@
       },
       "query-header": {
         "content-invalid-query": "",
+        "editor-modes": {
+          "label-builder": "",
+          "label-code": ""
+        },
         "label-dataset": "",
         "label-filter": "Filter",
         "label-format": "Format",
diff --git a/packages/grafana-sql/src/locales/es-ES/grafana-sql.json b/packages/grafana-sql/src/locales/es-ES/grafana-sql.json
index fbfe5c8bbfa..6fcd133d0fa 100644
--- a/packages/grafana-sql/src/locales/es-ES/grafana-sql.json
+++ b/packages/grafana-sql/src/locales/es-ES/grafana-sql.json
@@ -55,6 +55,10 @@
       },
       "query-header": {
         "content-invalid-query": "",
+        "editor-modes": {
+          "label-builder": "",
+          "label-code": ""
+        },
         "label-dataset": "",
         "label-filter": "Filtro",
         "label-format": "Formato",
diff --git a/packages/grafana-sql/src/locales/fr-FR/grafana-sql.json b/packages/grafana-sql/src/locales/fr-FR/grafana-sql.json
index ec35e126c7d..c970cbbd845 100644
--- a/packages/grafana-sql/src/locales/fr-FR/grafana-sql.json
+++ b/packages/grafana-sql/src/locales/fr-FR/grafana-sql.json
@@ -55,6 +55,10 @@
       },
       "query-header": {
         "content-invalid-query": "",
+        "editor-modes": {
+          "label-builder": "",
+          "label-code": ""
+        },
         "label-dataset": "",
         "label-filter": "Filtrer",
         "label-format": "Format",
diff --git a/packages/grafana-sql/src/locales/hu-HU/grafana-sql.json b/packages/grafana-sql/src/locales/hu-HU/grafana-sql.json
index f0d9ad1eed5..0c1803084cb 100644
--- a/packages/grafana-sql/src/locales/hu-HU/grafana-sql.json
+++ b/packages/grafana-sql/src/locales/hu-HU/grafana-sql.json
@@ -55,6 +55,10 @@
       },
       "query-header": {
         "content-invalid-query": "",
+        "editor-modes": {
+          "label-builder": "",
+          "label-code": ""
+        },
         "label-dataset": "",
         "label-filter": "Szűrő",
         "label-format": "Formátum",
diff --git a/packages/grafana-sql/src/locales/id-ID/grafana-sql.json b/packages/grafana-sql/src/locales/id-ID/grafana-sql.json
index 5733382d722..e6c977bca22 100644
--- a/packages/grafana-sql/src/locales/id-ID/grafana-sql.json
+++ b/packages/grafana-sql/src/locales/id-ID/grafana-sql.json
@@ -55,6 +55,10 @@
       },
       "query-header": {
         "content-invalid-query": "",
+        "editor-modes": {
+          "label-builder": "",
+          "label-code": ""
+        },
         "label-dataset": "",
         "label-filter": "Filter",
         "label-format": "Format",
diff --git a/packages/grafana-sql/src/locales/it-IT/grafana-sql.json b/packages/grafana-sql/src/locales/it-IT/grafana-sql.json
index c155ef2a4dc..b7194050d6f 100644
--- a/packages/grafana-sql/src/locales/it-IT/grafana-sql.json
+++ b/packages/grafana-sql/src/locales/it-IT/grafana-sql.json
@@ -55,6 +55,10 @@
       },
       "query-header": {
         "content-invalid-query": "",
+        "editor-modes": {
+          "label-builder": "",
+          "label-code": ""
+        },
         "label-dataset": "",
         "label-filter": "Filtro",
         "label-format": "Formato",
diff --git a/packages/grafana-sql/src/locales/ja-JP/grafana-sql.json b/packages/grafana-sql/src/locales/ja-JP/grafana-sql.json
index 4c74bb5be58..4340b874c6e 100644
--- a/packages/grafana-sql/src/locales/ja-JP/grafana-sql.json
+++ b/packages/grafana-sql/src/locales/ja-JP/grafana-sql.json
@@ -55,6 +55,10 @@
       },
       "query-header": {
         "content-invalid-query": "",
+        "editor-modes": {
+          "label-builder": "",
+          "label-code": ""
+        },
         "label-dataset": "",
         "label-filter": "フィルタリング",
         "label-format": "形式",
diff --git a/packages/grafana-sql/src/locales/ko-KR/grafana-sql.json b/packages/grafana-sql/src/locales/ko-KR/grafana-sql.json
index f9778c0e23c..ab01d9e61a0 100644
--- a/packages/grafana-sql/src/locales/ko-KR/grafana-sql.json
+++ b/packages/grafana-sql/src/locales/ko-KR/grafana-sql.json
@@ -55,6 +55,10 @@
       },
       "query-header": {
         "content-invalid-query": "",
+        "editor-modes": {
+          "label-builder": "",
+          "label-code": ""
+        },
         "label-dataset": "",
         "label-filter": "필터",
         "label-format": "형식",
diff --git a/packages/grafana-sql/src/locales/nl-NL/grafana-sql.json b/packages/grafana-sql/src/locales/nl-NL/grafana-sql.json
index f1e27ce05a5..2f7d4aed633 100644
--- a/packages/grafana-sql/src/locales/nl-NL/grafana-sql.json
+++ b/packages/grafana-sql/src/locales/nl-NL/grafana-sql.json
@@ -55,6 +55,10 @@
       },
       "query-header": {
         "content-invalid-query": "",
+        "editor-modes": {
+          "label-builder": "",
+          "label-code": ""
+        },
         "label-dataset": "",
         "label-filter": "Filter",
         "label-format": "Formaat",
diff --git a/packages/grafana-sql/src/locales/pl-PL/grafana-sql.json b/packages/grafana-sql/src/locales/pl-PL/grafana-sql.json
index 0752f5afddc..47e1140a92a 100644
--- a/packages/grafana-sql/src/locales/pl-PL/grafana-sql.json
+++ b/packages/grafana-sql/src/locales/pl-PL/grafana-sql.json
@@ -55,6 +55,10 @@
       },
       "query-header": {
         "content-invalid-query": "",
+        "editor-modes": {
+          "label-builder": "",
+          "label-code": ""
+        },
         "label-dataset": "",
         "label-filter": "Filtr",
         "label-format": "Format",
diff --git a/packages/grafana-sql/src/locales/pt-BR/grafana-sql.json b/packages/grafana-sql/src/locales/pt-BR/grafana-sql.json
index a0f9d14750b..8bb192f0a01 100644
--- a/packages/grafana-sql/src/locales/pt-BR/grafana-sql.json
+++ b/packages/grafana-sql/src/locales/pt-BR/grafana-sql.json
@@ -55,6 +55,10 @@
       },
       "query-header": {
         "content-invalid-query": "",
+        "editor-modes": {
+          "label-builder": "",
+          "label-code": ""
+        },
         "label-dataset": "",
         "label-filter": "Filtro",
         "label-format": "Formato",
diff --git a/packages/grafana-sql/src/locales/pt-PT/grafana-sql.json b/packages/grafana-sql/src/locales/pt-PT/grafana-sql.json
index 8561b05941b..4a5f9824264 100644
--- a/packages/grafana-sql/src/locales/pt-PT/grafana-sql.json
+++ b/packages/grafana-sql/src/locales/pt-PT/grafana-sql.json
@@ -55,6 +55,10 @@
       },
       "query-header": {
         "content-invalid-query": "",
+        "editor-modes": {
+          "label-builder": "",
+          "label-code": ""
+        },
         "label-dataset": "",
         "label-filter": "Filtro",
         "label-format": "Formato",
diff --git a/packages/grafana-sql/src/locales/ru-RU/grafana-sql.json b/packages/grafana-sql/src/locales/ru-RU/grafana-sql.json
index 2e0134da629..12440aa0ddc 100644
--- a/packages/grafana-sql/src/locales/ru-RU/grafana-sql.json
+++ b/packages/grafana-sql/src/locales/ru-RU/grafana-sql.json
@@ -55,6 +55,10 @@
       },
       "query-header": {
         "content-invalid-query": "",
+        "editor-modes": {
+          "label-builder": "",
+          "label-code": ""
+        },
         "label-dataset": "",
         "label-filter": "Фильтр",
         "label-format": "Формат",
diff --git a/packages/grafana-sql/src/locales/sv-SE/grafana-sql.json b/packages/grafana-sql/src/locales/sv-SE/grafana-sql.json
index 0d7dbeaf9a2..4dd442d92a4 100644
--- a/packages/grafana-sql/src/locales/sv-SE/grafana-sql.json
+++ b/packages/grafana-sql/src/locales/sv-SE/grafana-sql.json
@@ -55,6 +55,10 @@
       },
       "query-header": {
         "content-invalid-query": "",
+        "editor-modes": {
+          "label-builder": "",
+          "label-code": ""
+        },
         "label-dataset": "",
         "label-filter": "Filtrera",
         "label-format": "Format",
diff --git a/packages/grafana-sql/src/locales/tr-TR/grafana-sql.json b/packages/grafana-sql/src/locales/tr-TR/grafana-sql.json
index da83339c08f..06248f27ef1 100644
--- a/packages/grafana-sql/src/locales/tr-TR/grafana-sql.json
+++ b/packages/grafana-sql/src/locales/tr-TR/grafana-sql.json
@@ -55,6 +55,10 @@
       },
       "query-header": {
         "content-invalid-query": "",
+        "editor-modes": {
+          "label-builder": "",
+          "label-code": ""
+        },
         "label-dataset": "",
         "label-filter": "Filtreleyin",
         "label-format": "Biçim",
diff --git a/packages/grafana-sql/src/locales/zh-Hans/grafana-sql.json b/packages/grafana-sql/src/locales/zh-Hans/grafana-sql.json
index d22700fa3ac..43a461149b3 100644
--- a/packages/grafana-sql/src/locales/zh-Hans/grafana-sql.json
+++ b/packages/grafana-sql/src/locales/zh-Hans/grafana-sql.json
@@ -55,6 +55,10 @@
       },
       "query-header": {
         "content-invalid-query": "",
+        "editor-modes": {
+          "label-builder": "",
+          "label-code": ""
+        },
         "label-dataset": "",
         "label-filter": "筛选条件",
         "label-format": "格式",
diff --git a/packages/grafana-sql/src/locales/zh-Hant/grafana-sql.json b/packages/grafana-sql/src/locales/zh-Hant/grafana-sql.json
index 87c106d7b4d..0eea18e6fb2 100644
--- a/packages/grafana-sql/src/locales/zh-Hant/grafana-sql.json
+++ b/packages/grafana-sql/src/locales/zh-Hant/grafana-sql.json
@@ -55,6 +55,10 @@
       },
       "query-header": {
         "content-invalid-query": "",
+        "editor-modes": {
+          "label-builder": "",
+          "label-code": ""
+        },
         "label-dataset": "",
         "label-filter": "篩選",
         "label-format": "格式",
diff --git a/public/app/plugins/datasource/azuremonitor/locales/cs-CZ/grafana-azure-monitor-datasource.json b/public/app/plugins/datasource/azuremonitor/locales/cs-CZ/grafana-azure-monitor-datasource.json
index d00dc5b60de..b1f951a843c 100644
--- a/public/app/plugins/datasource/azuremonitor/locales/cs-CZ/grafana-azure-monitor-datasource.json
+++ b/public/app/plugins/datasource/azuremonitor/locales/cs-CZ/grafana-azure-monitor-datasource.json
@@ -52,6 +52,7 @@
       "button-use-query": "Použít tento dotaz",
       "label-categories": "Kategorie",
       "label-query-results": "Výsledky dotazu: {{numResults}}",
+      "noOptionsMessage-unable-to-list-categories": "",
       "placeholder-all-categories": "Všechny kategorie",
       "placeholder-search-logs": "Hledat dotazy protokolů",
       "text-loading": "Načítání…"
@@ -161,6 +162,8 @@
       "tooltip-limit": "Omezte počet vrácených řádků (výchozí hodnota je 1 000)."
     },
     "logs-management": {
+      "body-basic-logs-queries": "",
+      "confirmText-confirm": "",
       "description-basic-logs-queries": "Dotazy na základní protokoly jsou zpoplatněny na základě množství naskenovaných dat.",
       "label-logs": "Protokoly",
       "title-basic-logs-queries": "Dotazy na základní protokoly",
@@ -194,8 +197,15 @@
     },
     "query-header": {
       "aria-label-kick-start": "Tlačítko Spustit dotaz protokolů Azure",
+      "body-switching-to-builder": "",
+      "body-switching-to-kql": "",
       "button-kick-start-your-query": "Spustit dotaz",
       "button-run-query": "Spustit dotaz",
+      "confirmText-switch-to": "",
+      "editor-modes": {
+        "label-builder": "",
+        "label-kql": ""
+      },
       "label-service": "Služba",
       "placeholder-service": "Služba…",
       "title-switch-mode": "Přepnout režim editoru?"
diff --git a/public/app/plugins/datasource/azuremonitor/locales/de-DE/grafana-azure-monitor-datasource.json b/public/app/plugins/datasource/azuremonitor/locales/de-DE/grafana-azure-monitor-datasource.json
index 0f33925d236..7b5adf4401a 100644
--- a/public/app/plugins/datasource/azuremonitor/locales/de-DE/grafana-azure-monitor-datasource.json
+++ b/public/app/plugins/datasource/azuremonitor/locales/de-DE/grafana-azure-monitor-datasource.json
@@ -52,6 +52,7 @@
       "button-use-query": "Diese Abfrage nutzen",
       "label-categories": "Kategorien",
       "label-query-results": "Abfrageergebnisse: {{numResults}}",
+      "noOptionsMessage-unable-to-list-categories": "",
       "placeholder-all-categories": "Alle Kategorien",
       "placeholder-search-logs": "Logs-Abfragen durchsuchen",
       "text-loading": "Wird geladen ..."
@@ -161,6 +162,8 @@
       "tooltip-limit": "Beschränken Sie die Zahl der zurückgegebenen Zeilen (Standard ist 1000)."
     },
     "logs-management": {
+      "body-basic-logs-queries": "",
+      "confirmText-confirm": "",
       "description-basic-logs-queries": "Für Abfragen von Basis-Logs fallen Kosten an, je nach der Menge der gescannten Daten.",
       "label-logs": "Logs",
       "title-basic-logs-queries": "Abfragen von Basis-Logs",
@@ -194,8 +197,15 @@
     },
     "query-header": {
       "aria-label-kick-start": "Azure-Logs starten Ihre Abfrage-Schaltfläche",
+      "body-switching-to-builder": "",
+      "body-switching-to-kql": "",
       "button-kick-start-your-query": "Starten Sie Ihre Abfrage",
       "button-run-query": "Abfrage ausführen",
+      "confirmText-switch-to": "",
+      "editor-modes": {
+        "label-builder": "",
+        "label-kql": ""
+      },
       "label-service": "Dienst",
       "placeholder-service": "Dienst …",
       "title-switch-mode": "Editor-Modus wechseln?"
diff --git a/public/app/plugins/datasource/azuremonitor/locales/es-ES/grafana-azure-monitor-datasource.json b/public/app/plugins/datasource/azuremonitor/locales/es-ES/grafana-azure-monitor-datasource.json
index 2d2d1144cd1..385fa114747 100644
--- a/public/app/plugins/datasource/azuremonitor/locales/es-ES/grafana-azure-monitor-datasource.json
+++ b/public/app/plugins/datasource/azuremonitor/locales/es-ES/grafana-azure-monitor-datasource.json
@@ -52,6 +52,7 @@
       "button-use-query": "Utilizar esta consulta",
       "label-categories": "Categorías",
       "label-query-results": "Resultados de la consulta: {{numResults}}",
+      "noOptionsMessage-unable-to-list-categories": "",
       "placeholder-all-categories": "Todas las categorías",
       "placeholder-search-logs": "Buscar consultas de logs",
       "text-loading": "Cargando..."
@@ -161,6 +162,8 @@
       "tooltip-limit": "Restrinja el número de filas devueltas (el valor predeterminado es 1000)."
     },
     "logs-management": {
+      "body-basic-logs-queries": "",
+      "confirmText-confirm": "",
       "description-basic-logs-queries": "Las consultas de logs básicos incurren en un coste basado en la cantidad de datos escaneados.",
       "label-logs": "Logs",
       "title-basic-logs-queries": "Consultas de logs básicos",
@@ -194,8 +197,15 @@
     },
     "query-header": {
       "aria-label-kick-start": "Los logs de Azure inician su botón de consulta",
+      "body-switching-to-builder": "",
+      "body-switching-to-kql": "",
       "button-kick-start-your-query": "Inicie su consulta",
       "button-run-query": "Ejecutar consulta",
+      "confirmText-switch-to": "",
+      "editor-modes": {
+        "label-builder": "",
+        "label-kql": ""
+      },
       "label-service": "Servicio",
       "placeholder-service": "Servicio...",
       "title-switch-mode": "¿Cambiar al modo de edición?"
diff --git a/public/app/plugins/datasource/azuremonitor/locales/fr-FR/grafana-azure-monitor-datasource.json b/public/app/plugins/datasource/azuremonitor/locales/fr-FR/grafana-azure-monitor-datasource.json
index 431a645aede..9ba907b9072 100644
--- a/public/app/plugins/datasource/azuremonitor/locales/fr-FR/grafana-azure-monitor-datasource.json
+++ b/public/app/plugins/datasource/azuremonitor/locales/fr-FR/grafana-azure-monitor-datasource.json
@@ -52,6 +52,7 @@
       "button-use-query": "Utiliser cette requête",
       "label-categories": "Catégories",
       "label-query-results": "Résultats de la requête : {{numResults}}",
+      "noOptionsMessage-unable-to-list-categories": "",
       "placeholder-all-categories": "Toutes les catégories",
       "placeholder-search-logs": "Rechercher des requêtes de journaux",
       "text-loading": "Chargement en cours..."
@@ -161,6 +162,8 @@
       "tooltip-limit": "Limitez le nombre de lignes renvoyées (la valeur par défaut est 1 000)."
     },
     "logs-management": {
+      "body-basic-logs-queries": "",
+      "confirmText-confirm": "",
       "description-basic-logs-queries": "Les requêtes de journaux de base entraînent des coûts en fonction de la quantité de données analysées.",
       "label-logs": "Journaux",
       "title-basic-logs-queries": "Requêtes de journaux de base",
@@ -194,8 +197,15 @@
     },
     "query-header": {
       "aria-label-kick-start": "Bouton Lancer votre requête des journaux Azure",
+      "body-switching-to-builder": "",
+      "body-switching-to-kql": "",
       "button-kick-start-your-query": "Lancer votre requête",
       "button-run-query": "Exécuter la requête",
+      "confirmText-switch-to": "",
+      "editor-modes": {
+        "label-builder": "",
+        "label-kql": ""
+      },
       "label-service": "Service",
       "placeholder-service": "Service...",
       "title-switch-mode": "Passer au mode d’édition ?"
diff --git a/public/app/plugins/datasource/azuremonitor/locales/hu-HU/grafana-azure-monitor-datasource.json b/public/app/plugins/datasource/azuremonitor/locales/hu-HU/grafana-azure-monitor-datasource.json
index bc16508e61e..4ccef7bbbfe 100644
--- a/public/app/plugins/datasource/azuremonitor/locales/hu-HU/grafana-azure-monitor-datasource.json
+++ b/public/app/plugins/datasource/azuremonitor/locales/hu-HU/grafana-azure-monitor-datasource.json
@@ -52,6 +52,7 @@
       "button-use-query": "Használja ezt a lekérdezést",
       "label-categories": "Kategóriák",
       "label-query-results": "Lekérdezés eredményei: {{numResults}}",
+      "noOptionsMessage-unable-to-list-categories": "",
       "placeholder-all-categories": "Összes kategória",
       "placeholder-search-logs": "Naplólekérdezések keresése",
       "text-loading": "Betöltés…"
@@ -161,6 +162,8 @@
       "tooltip-limit": "A visszaadott sorok számának korlátozása (az alapértelmezett érték az 1000)."
     },
     "logs-management": {
+      "body-basic-logs-queries": "",
+      "confirmText-confirm": "",
       "description-basic-logs-queries": "Az Alapvető naplók lekérdezései a beolvasott adatok mennyiségétől függően költséget eredményeznek.",
       "label-logs": "Naplók",
       "title-basic-logs-queries": "Alapvető naplók lekérdezései",
@@ -194,8 +197,15 @@
     },
     "query-header": {
       "aria-label-kick-start": "Azure-naplók előbeállításos lekérdezése gomb",
+      "body-switching-to-builder": "",
+      "body-switching-to-kql": "",
       "button-kick-start-your-query": "Előbeállításos lekérdezés",
       "button-run-query": "Lekérdezés futtatása",
+      "confirmText-switch-to": "",
+      "editor-modes": {
+        "label-builder": "",
+        "label-kql": ""
+      },
       "label-service": "Szolgáltatás",
       "placeholder-service": "Szolgáltatás…",
       "title-switch-mode": "Váltás szerkesztési módba?"
diff --git a/public/app/plugins/datasource/azuremonitor/locales/id-ID/grafana-azure-monitor-datasource.json b/public/app/plugins/datasource/azuremonitor/locales/id-ID/grafana-azure-monitor-datasource.json
index 1c2e4c4eefb..3ab6b7e9853 100644
--- a/public/app/plugins/datasource/azuremonitor/locales/id-ID/grafana-azure-monitor-datasource.json
+++ b/public/app/plugins/datasource/azuremonitor/locales/id-ID/grafana-azure-monitor-datasource.json
@@ -52,6 +52,7 @@
       "button-use-query": "Gunakan kueri ini",
       "label-categories": "Kategori",
       "label-query-results": "Hasil kueri: {{numResults}}",
+      "noOptionsMessage-unable-to-list-categories": "",
       "placeholder-all-categories": "Semua kategori",
       "placeholder-search-logs": "Pencarian kueri Log",
       "text-loading": "Memuat..."
@@ -161,6 +162,8 @@
       "tooltip-limit": "Batasi jumlah baris yang dikembalikan (default-nya adalah 1000)."
     },
     "logs-management": {
+      "body-basic-logs-queries": "",
+      "confirmText-confirm": "",
       "description-basic-logs-queries": "Kueri Log Dasar dikenakan biaya berdasarkan jumlah data yang dipindai.",
       "label-logs": "Log",
       "title-basic-logs-queries": "Kueri Log Dasar",
@@ -194,8 +197,15 @@
     },
     "query-header": {
       "aria-label-kick-start": "Tombol kueri untuk memulai menggunakan log Azure",
+      "body-switching-to-builder": "",
+      "body-switching-to-kql": "",
       "button-kick-start-your-query": "Mulai kueri Anda",
       "button-run-query": "Jalankan kueri",
+      "confirmText-switch-to": "",
+      "editor-modes": {
+        "label-builder": "",
+        "label-kql": ""
+      },
       "label-service": "Layanan",
       "placeholder-service": "Melayani...",
       "title-switch-mode": "Beralih ke mode editor?"
diff --git a/public/app/plugins/datasource/azuremonitor/locales/it-IT/grafana-azure-monitor-datasource.json b/public/app/plugins/datasource/azuremonitor/locales/it-IT/grafana-azure-monitor-datasource.json
index 129013718ef..ff698e97ada 100644
--- a/public/app/plugins/datasource/azuremonitor/locales/it-IT/grafana-azure-monitor-datasource.json
+++ b/public/app/plugins/datasource/azuremonitor/locales/it-IT/grafana-azure-monitor-datasource.json
@@ -52,6 +52,7 @@
       "button-use-query": "Utilizza questa query",
       "label-categories": "Categorie",
       "label-query-results": "Risultati della query: {{numResults}}",
+      "noOptionsMessage-unable-to-list-categories": "",
       "placeholder-all-categories": "Tutte le categorie",
       "placeholder-search-logs": "Cerca query dei registri",
       "text-loading": "Caricamento in corso..."
@@ -161,6 +162,8 @@
       "tooltip-limit": "Limita il numero di righe restituite (il valore predefinito è 1000)."
     },
     "logs-management": {
+      "body-basic-logs-queries": "",
+      "confirmText-confirm": "",
       "description-basic-logs-queries": "Le query dei registri di base comportano un costo in base alla quantità di dati analizzati.",
       "label-logs": "Registri",
       "title-basic-logs-queries": "Query sui registri di base",
@@ -194,8 +197,15 @@
     },
     "query-header": {
       "aria-label-kick-start": "I registri di Azure avviano il pulsante della query",
+      "body-switching-to-builder": "",
+      "body-switching-to-kql": "",
       "button-kick-start-your-query": "Avvia la query",
       "button-run-query": "Esegui query",
+      "confirmText-switch-to": "",
+      "editor-modes": {
+        "label-builder": "",
+        "label-kql": ""
+      },
       "label-service": "Servizio",
       "placeholder-service": "Servizio...",
       "title-switch-mode": "Cambiare modalità editor?"
diff --git a/public/app/plugins/datasource/azuremonitor/locales/ja-JP/grafana-azure-monitor-datasource.json b/public/app/plugins/datasource/azuremonitor/locales/ja-JP/grafana-azure-monitor-datasource.json
index 672349f7891..165a50a63bc 100644
--- a/public/app/plugins/datasource/azuremonitor/locales/ja-JP/grafana-azure-monitor-datasource.json
+++ b/public/app/plugins/datasource/azuremonitor/locales/ja-JP/grafana-azure-monitor-datasource.json
@@ -52,6 +52,7 @@
       "button-use-query": "このクエリを使用",
       "label-categories": "カテゴリ－",
       "label-query-results": "クエリ結果：{{numResults}}",
+      "noOptionsMessage-unable-to-list-categories": "",
       "placeholder-all-categories": "すべてのカテゴリー",
       "placeholder-search-logs": "ログクエリを検索",
       "text-loading": "読み込み中..."
@@ -161,6 +162,8 @@
       "tooltip-limit": "返される行数を制限します（デフォルトは1000）。"
     },
     "logs-management": {
+      "body-basic-logs-queries": "",
+      "confirmText-confirm": "",
       "description-basic-logs-queries": "基本ログクエリを使用すると、スキャンされたデータ量に基づいてコストが発生します。",
       "label-logs": "ログ",
       "title-basic-logs-queries": "基本ログクエリ",
@@ -194,8 +197,15 @@
     },
     "query-header": {
       "aria-label-kick-start": "Azureログのクエリ開始ボタン",
+      "body-switching-to-builder": "",
+      "body-switching-to-kql": "",
       "button-kick-start-your-query": "クエリを開始",
       "button-run-query": "クエリの実行",
+      "confirmText-switch-to": "",
+      "editor-modes": {
+        "label-builder": "",
+        "label-kql": ""
+      },
       "label-service": "サービス",
       "placeholder-service": "サービス...",
       "title-switch-mode": "エディターモードを切り替えますか？"
diff --git a/public/app/plugins/datasource/azuremonitor/locales/ko-KR/grafana-azure-monitor-datasource.json b/public/app/plugins/datasource/azuremonitor/locales/ko-KR/grafana-azure-monitor-datasource.json
index 627ccff83a0..a5c0286ae6e 100644
--- a/public/app/plugins/datasource/azuremonitor/locales/ko-KR/grafana-azure-monitor-datasource.json
+++ b/public/app/plugins/datasource/azuremonitor/locales/ko-KR/grafana-azure-monitor-datasource.json
@@ -52,6 +52,7 @@
       "button-use-query": "이 쿼리 사용",
       "label-categories": "범주",
       "label-query-results": "쿼리 결과: {{numResults}}",
+      "noOptionsMessage-unable-to-list-categories": "",
       "placeholder-all-categories": "모든 범주",
       "placeholder-search-logs": "로그 쿼리 검색",
       "text-loading": "로딩 중..."
@@ -161,6 +162,8 @@
       "tooltip-limit": "반환되는 행 수를 제한합니다(기본값은 1000)."
     },
     "logs-management": {
+      "body-basic-logs-queries": "",
+      "confirmText-confirm": "",
       "description-basic-logs-queries": "기본 로그 쿼리는 스캔된 데이터 양에 따라 비용이 발생합니다.",
       "label-logs": "로그",
       "title-basic-logs-queries": "기본 로그 쿼리",
@@ -194,8 +197,15 @@
     },
     "query-header": {
       "aria-label-kick-start": "Azure 로그 쿼리 시작 버튼",
+      "body-switching-to-builder": "",
+      "body-switching-to-kql": "",
       "button-kick-start-your-query": "쿼리 시작하기",
       "button-run-query": "쿼리 실행",
+      "confirmText-switch-to": "",
+      "editor-modes": {
+        "label-builder": "",
+        "label-kql": ""
+      },
       "label-service": "서비스",
       "placeholder-service": "서비스...",
       "title-switch-mode": "편집기 모드를 전환하시겠어요?"
diff --git a/public/app/plugins/datasource/azuremonitor/locales/nl-NL/grafana-azure-monitor-datasource.json b/public/app/plugins/datasource/azuremonitor/locales/nl-NL/grafana-azure-monitor-datasource.json
index 7f99a7ed5c6..92b8e41d8ee 100644
--- a/public/app/plugins/datasource/azuremonitor/locales/nl-NL/grafana-azure-monitor-datasource.json
+++ b/public/app/plugins/datasource/azuremonitor/locales/nl-NL/grafana-azure-monitor-datasource.json
@@ -52,6 +52,7 @@
       "button-use-query": "Gebruik deze query",
       "label-categories": "Categorieën",
       "label-query-results": "Resultaten van query: {{numResults}}",
+      "noOptionsMessage-unable-to-list-categories": "",
       "placeholder-all-categories": "Alle categorieën",
       "placeholder-search-logs": "Querylogboeken zoeken",
       "text-loading": "Laden..."
@@ -161,6 +162,8 @@
       "tooltip-limit": "Beperk het aantal geretourneerde rijen (standaard is 1000)."
     },
     "logs-management": {
+      "body-basic-logs-queries": "",
+      "confirmText-confirm": "",
       "description-basic-logs-queries": "Basislogquery's brengen kosten met zich mee op basis van de hoeveelheid gescande gegevens.",
       "label-logs": "Logs",
       "title-basic-logs-queries": "Basislogquery's",
@@ -194,8 +197,15 @@
     },
     "query-header": {
       "aria-label-kick-start": "Knop Start query met Azure-logboeken",
+      "body-switching-to-builder": "",
+      "body-switching-to-kql": "",
       "button-kick-start-your-query": "Start je query",
       "button-run-query": "Query uitvoeren",
+      "confirmText-switch-to": "",
+      "editor-modes": {
+        "label-builder": "",
+        "label-kql": ""
+      },
       "label-service": "Service",
       "placeholder-service": "Service...",
       "title-switch-mode": "Veranderen van bewerkersmodus?"
diff --git a/public/app/plugins/datasource/azuremonitor/locales/pl-PL/grafana-azure-monitor-datasource.json b/public/app/plugins/datasource/azuremonitor/locales/pl-PL/grafana-azure-monitor-datasource.json
index 1cbab6280a4..9eb4415ea63 100644
--- a/public/app/plugins/datasource/azuremonitor/locales/pl-PL/grafana-azure-monitor-datasource.json
+++ b/public/app/plugins/datasource/azuremonitor/locales/pl-PL/grafana-azure-monitor-datasource.json
@@ -52,6 +52,7 @@
       "button-use-query": "Użyj tego zapytania",
       "label-categories": "Kategorie",
       "label-query-results": "Wyniki zapytania: {{numResults}}",
+      "noOptionsMessage-unable-to-list-categories": "",
       "placeholder-all-categories": "Wszystkie kategorie",
       "placeholder-search-logs": "Wyszukaj zapytania dotyczące dzienników",
       "text-loading": "Ładowanie…"
@@ -161,6 +162,8 @@
       "tooltip-limit": "Ogranicz liczbę zwracanych wierszy (domyślnie 1000)."
     },
     "logs-management": {
+      "body-basic-logs-queries": "",
+      "confirmText-confirm": "",
       "description-basic-logs-queries": "Zapytania dotyczące podstawowych dzienników wiążą się z kosztami w zależności od ilości przeskanowanych danych.",
       "label-logs": "Logi",
       "title-basic-logs-queries": "Zapytania dotyczące podstawowych dzienników",
@@ -194,8 +197,15 @@
     },
     "query-header": {
       "aria-label-kick-start": "Przycisk Uruchom zapytanie dotyczący dzienników Azure",
+      "body-switching-to-builder": "",
+      "body-switching-to-kql": "",
       "button-kick-start-your-query": "Uruchom zapytanie",
       "button-run-query": "Uruchom zapytanie",
+      "confirmText-switch-to": "",
+      "editor-modes": {
+        "label-builder": "",
+        "label-kql": ""
+      },
       "label-service": "Usługa",
       "placeholder-service": "Usługa…",
       "title-switch-mode": "Przełączyć tryb edytora?"
diff --git a/public/app/plugins/datasource/azuremonitor/locales/pt-BR/grafana-azure-monitor-datasource.json b/public/app/plugins/datasource/azuremonitor/locales/pt-BR/grafana-azure-monitor-datasource.json
index 0c41247797d..ab362edc573 100644
--- a/public/app/plugins/datasource/azuremonitor/locales/pt-BR/grafana-azure-monitor-datasource.json
+++ b/public/app/plugins/datasource/azuremonitor/locales/pt-BR/grafana-azure-monitor-datasource.json
@@ -52,6 +52,7 @@
       "button-use-query": "Usar esta consulta",
       "label-categories": "Categorias",
       "label-query-results": "Resultados da consulta: {{numResults}}",
+      "noOptionsMessage-unable-to-list-categories": "",
       "placeholder-all-categories": "Todas as categorias",
       "placeholder-search-logs": "Fazer buscas nas consultas de logs",
       "text-loading": "Carregando..."
@@ -161,6 +162,8 @@
       "tooltip-limit": "Restrinja a quantidade de linhas retornadas (o valor padrão é 1.000)."
     },
     "logs-management": {
+      "body-basic-logs-queries": "",
+      "confirmText-confirm": "",
       "description-basic-logs-queries": "As consultas de logs básicos incorrem em custos com base na quantidade de dados verificados.",
       "label-logs": "Logs",
       "title-basic-logs-queries": "Consultas de logs básicos",
@@ -194,8 +197,15 @@
     },
     "query-header": {
       "aria-label-kick-start": "Botão de iniciar consulta de logs do Azure",
+      "body-switching-to-builder": "",
+      "body-switching-to-kql": "",
       "button-kick-start-your-query": "Iniciar sua consulta",
       "button-run-query": "Executar consulta",
+      "confirmText-switch-to": "",
+      "editor-modes": {
+        "label-builder": "",
+        "label-kql": ""
+      },
       "label-service": "Serviço",
       "placeholder-service": "Serviço...",
       "title-switch-mode": "Deseja trocar para o modo de edição?"
diff --git a/public/app/plugins/datasource/azuremonitor/locales/pt-PT/grafana-azure-monitor-datasource.json b/public/app/plugins/datasource/azuremonitor/locales/pt-PT/grafana-azure-monitor-datasource.json
index b92e3e7489f..42424f61c2e 100644
--- a/public/app/plugins/datasource/azuremonitor/locales/pt-PT/grafana-azure-monitor-datasource.json
+++ b/public/app/plugins/datasource/azuremonitor/locales/pt-PT/grafana-azure-monitor-datasource.json
@@ -52,6 +52,7 @@
       "button-use-query": "Utilizar esta consulta",
       "label-categories": "Categorias",
       "label-query-results": "Resultados da consulta: {{numResults}}",
+      "noOptionsMessage-unable-to-list-categories": "",
       "placeholder-all-categories": "Todas as categorias",
       "placeholder-search-logs": "Pesquisar consultas de registos",
       "text-loading": "A carregar..."
@@ -161,6 +162,8 @@
       "tooltip-limit": "Restrinja o número de linhas devolvidas (a predefinição é 1000)."
     },
     "logs-management": {
+      "body-basic-logs-queries": "",
+      "confirmText-confirm": "",
       "description-basic-logs-queries": "As consultas de registos básicos incorrem em custos com base na quantidade de dados lidos.",
       "label-logs": "Registos",
       "title-basic-logs-queries": "Consultas de registos básicos",
@@ -194,8 +197,15 @@
     },
     "query-header": {
       "aria-label-kick-start": "Botão de início de consulta de registos do Azure",
+      "body-switching-to-builder": "",
+      "body-switching-to-kql": "",
       "button-kick-start-your-query": "Dê início à sua consulta",
       "button-run-query": "Executar consulta",
+      "confirmText-switch-to": "",
+      "editor-modes": {
+        "label-builder": "",
+        "label-kql": ""
+      },
       "label-service": "Serviço",
       "placeholder-service": "Serviço...",
       "title-switch-mode": "Mudar o modo de editor?"
diff --git a/public/app/plugins/datasource/azuremonitor/locales/ru-RU/grafana-azure-monitor-datasource.json b/public/app/plugins/datasource/azuremonitor/locales/ru-RU/grafana-azure-monitor-datasource.json
index bb7916e57c5..fc75819703a 100644
--- a/public/app/plugins/datasource/azuremonitor/locales/ru-RU/grafana-azure-monitor-datasource.json
+++ b/public/app/plugins/datasource/azuremonitor/locales/ru-RU/grafana-azure-monitor-datasource.json
@@ -52,6 +52,7 @@
       "button-use-query": "Использовать запрос",
       "label-categories": "Категории",
       "label-query-results": "Результатов запроса: {{numResults}}",
+      "noOptionsMessage-unable-to-list-categories": "",
       "placeholder-all-categories": "Все категории",
       "placeholder-search-logs": "Поиск запросов журналов",
       "text-loading": "Загрузка…"
@@ -161,6 +162,8 @@
       "tooltip-limit": "Установите ограничение по количеству возвращаемых строк (по умолчанию — 1000)."
     },
     "logs-management": {
+      "body-basic-logs-queries": "",
+      "confirmText-confirm": "",
       "description-basic-logs-queries": "Запросы базовых журналов являются платными. Затраты зависят от объема сканируемых данных.",
       "label-logs": "Журналы",
       "title-basic-logs-queries": "Запросы базовых журналов",
@@ -194,8 +197,15 @@
     },
     "query-header": {
       "aria-label-kick-start": "Кнопка запуска запроса журналов Azure",
+      "body-switching-to-builder": "",
+      "body-switching-to-kql": "",
       "button-kick-start-your-query": "Запустить запрос",
       "button-run-query": "Выполнить запрос",
+      "confirmText-switch-to": "",
+      "editor-modes": {
+        "label-builder": "",
+        "label-kql": ""
+      },
       "label-service": "Служба",
       "placeholder-service": "Служба...",
       "title-switch-mode": "Переключить режим редактора?"
diff --git a/public/app/plugins/datasource/azuremonitor/locales/sv-SE/grafana-azure-monitor-datasource.json b/public/app/plugins/datasource/azuremonitor/locales/sv-SE/grafana-azure-monitor-datasource.json
index 3c7f8f697d1..c190317bfb2 100644
--- a/public/app/plugins/datasource/azuremonitor/locales/sv-SE/grafana-azure-monitor-datasource.json
+++ b/public/app/plugins/datasource/azuremonitor/locales/sv-SE/grafana-azure-monitor-datasource.json
@@ -52,6 +52,7 @@
       "button-use-query": "Använd denna fråga",
       "label-categories": "Kategorier",
       "label-query-results": "Resultat av fråga: {{numResults}}",
+      "noOptionsMessage-unable-to-list-categories": "",
       "placeholder-all-categories": "Alla kategorier",
       "placeholder-search-logs": "Sök loggfrågor",
       "text-loading": "Laddar …"
@@ -161,6 +162,8 @@
       "tooltip-limit": "Begränsa antalet rader som returneras (standard är 1 000)."
     },
     "logs-management": {
+      "body-basic-logs-queries": "",
+      "confirmText-confirm": "",
       "description-basic-logs-queries": "Grundläggande loggfrågor medför kostnader baserat på mängden data som skannas.",
       "label-logs": "Loggar",
       "title-basic-logs-queries": "Grundläggande loggfrågor",
@@ -194,8 +197,15 @@
     },
     "query-header": {
       "aria-label-kick-start": "Knapp för att kickstarta Azure-loggfrågor",
+      "body-switching-to-builder": "",
+      "body-switching-to-kql": "",
       "button-kick-start-your-query": "Kickstarta din fråga",
       "button-run-query": "Kör fråga",
+      "confirmText-switch-to": "",
+      "editor-modes": {
+        "label-builder": "",
+        "label-kql": ""
+      },
       "label-service": "Service",
       "placeholder-service": "Service …",
       "title-switch-mode": "Växla redigeringsläge?"
diff --git a/public/app/plugins/datasource/azuremonitor/locales/tr-TR/grafana-azure-monitor-datasource.json b/public/app/plugins/datasource/azuremonitor/locales/tr-TR/grafana-azure-monitor-datasource.json
index b4f242b9bf4..81e42162930 100644
--- a/public/app/plugins/datasource/azuremonitor/locales/tr-TR/grafana-azure-monitor-datasource.json
+++ b/public/app/plugins/datasource/azuremonitor/locales/tr-TR/grafana-azure-monitor-datasource.json
@@ -52,6 +52,7 @@
       "button-use-query": "Bu sorguyu kullanın",
       "label-categories": "Kategoriler",
       "label-query-results": "Sorgu sonuçları: {{numResults}}",
+      "noOptionsMessage-unable-to-list-categories": "",
       "placeholder-all-categories": "Tüm kategoriler",
       "placeholder-search-logs": "Günlük sorgusu ara",
       "text-loading": "Yükleniyor..."
@@ -161,6 +162,8 @@
       "tooltip-limit": "Döndürülen satır sayısını kısıtlayın (varsayılan 1000'dir)."
     },
     "logs-management": {
+      "body-basic-logs-queries": "",
+      "confirmText-confirm": "",
       "description-basic-logs-queries": "Temel Günlük sorguları, taranan veri miktarına bağlı olarak maliyet doğurur.",
       "label-logs": "Günlük kayıtları",
       "title-basic-logs-queries": "Temel Günlük Sorguları",
@@ -194,8 +197,15 @@
     },
     "query-header": {
       "aria-label-kick-start": "Azure günlükleri sorgu hızlı başlatma düğmesi",
+      "body-switching-to-builder": "",
+      "body-switching-to-kql": "",
       "button-kick-start-your-query": "Sorgunuzu hızlı başlatın",
       "button-run-query": "Sorgu çalıştır",
+      "confirmText-switch-to": "",
+      "editor-modes": {
+        "label-builder": "",
+        "label-kql": ""
+      },
       "label-service": "Hizmet",
       "placeholder-service": "Hizmet...",
       "title-switch-mode": "Düzenleyici moduna geçilsin mi?"
diff --git a/public/app/plugins/datasource/azuremonitor/locales/zh-Hans/grafana-azure-monitor-datasource.json b/public/app/plugins/datasource/azuremonitor/locales/zh-Hans/grafana-azure-monitor-datasource.json
index ae72a995b28..4467bf4c460 100644
--- a/public/app/plugins/datasource/azuremonitor/locales/zh-Hans/grafana-azure-monitor-datasource.json
+++ b/public/app/plugins/datasource/azuremonitor/locales/zh-Hans/grafana-azure-monitor-datasource.json
@@ -52,6 +52,7 @@
       "button-use-query": "使用此查询",
       "label-categories": "类别",
       "label-query-results": "查询结果：{{numResults}}",
+      "noOptionsMessage-unable-to-list-categories": "",
       "placeholder-all-categories": "所有类别",
       "placeholder-search-logs": "在日志查询中搜索",
       "text-loading": "加载中..."
@@ -161,6 +162,8 @@
       "tooltip-limit": "限制返回的行数（默认为 1000）。"
     },
     "logs-management": {
+      "body-basic-logs-queries": "",
+      "confirmText-confirm": "",
       "description-basic-logs-queries": "基本日志查询根据扫描的数据量产生费用。",
       "label-logs": "日志",
       "title-basic-logs-queries": "基本日志查询",
@@ -194,8 +197,15 @@
     },
     "query-header": {
       "aria-label-kick-start": "Azure 日志启动查询按钮",
+      "body-switching-to-builder": "",
+      "body-switching-to-kql": "",
       "button-kick-start-your-query": "启动您的查询",
       "button-run-query": "运行查询",
+      "confirmText-switch-to": "",
+      "editor-modes": {
+        "label-builder": "",
+        "label-kql": ""
+      },
       "label-service": "服务",
       "placeholder-service": "服务...",
       "title-switch-mode": "切换编辑器模式？"
diff --git a/public/app/plugins/datasource/azuremonitor/locales/zh-Hant/grafana-azure-monitor-datasource.json b/public/app/plugins/datasource/azuremonitor/locales/zh-Hant/grafana-azure-monitor-datasource.json
index d265ab34f07..680542fff24 100644
--- a/public/app/plugins/datasource/azuremonitor/locales/zh-Hant/grafana-azure-monitor-datasource.json
+++ b/public/app/plugins/datasource/azuremonitor/locales/zh-Hant/grafana-azure-monitor-datasource.json
@@ -52,6 +52,7 @@
       "button-use-query": "使用此查詢",
       "label-categories": "分類",
       "label-query-results": "查詢結果：{{numResults}}",
+      "noOptionsMessage-unable-to-list-categories": "",
       "placeholder-all-categories": "所有分類",
       "placeholder-search-logs": "搜尋「紀錄查詢」",
       "text-loading": "正在載入…"
@@ -161,6 +162,8 @@
       "tooltip-limit": "限制傳回的列數（預設為 1000）。"
     },
     "logs-management": {
+      "body-basic-logs-queries": "",
+      "confirmText-confirm": "",
       "description-basic-logs-queries": "基本紀錄查詢會根據掃描的資料量產生費用。",
       "label-logs": "紀錄",
       "title-basic-logs-queries": "基本紀錄查詢",
@@ -194,8 +197,15 @@
     },
     "query-header": {
       "aria-label-kick-start": "Azure 紀錄會啟動您的查詢按鈕",
+      "body-switching-to-builder": "",
+      "body-switching-to-kql": "",
       "button-kick-start-your-query": "啟動您的查詢",
       "button-run-query": "執行查詢",
+      "confirmText-switch-to": "",
+      "editor-modes": {
+        "label-builder": "",
+        "label-kql": ""
+      },
       "label-service": "服務",
       "placeholder-service": "服務…",
       "title-switch-mode": "要切換編輯器模式嗎？"
diff --git a/public/locales/cs-CZ/grafana.json b/public/locales/cs-CZ/grafana.json
index 5b405718570..e6027d7ec7c 100644
--- a/public/locales/cs-CZ/grafana.json
+++ b/public/locales/cs-CZ/grafana.json
@@ -84,6 +84,7 @@
     "admin-feature-toggles-table": {
       "confirm-modal-body-1": "Některé funkce jsou stabilní (GA) a povolené ve výchozím nastavení, zatímco některé funkce jsou v současné době ve fázi předběžné beta verze, připravené k implementaci.",
       "confirm-modal-body-2": "Před provedením úprav doporučujeme porozumět důsledkům každé změny funkce.",
+      "confirmText-save-changes": "",
       "get-stage-cell": {
         "beta": "Beta",
         "content-general-availability": "Obecná dostupnost",
@@ -96,14 +97,21 @@
     },
     "admin-orgs-table": {
       "aria-label-delete-org": "Odstranit organizaci",
+      "confirmText-delete": "",
       "title-delete": "Odstranit"
     },
     "anon-users": {
       "not-found": "Nebyli nalezeni žádní anonymní uživatelé."
     },
     "base-user-sessions": {
+      "body-force-logout-from-all-devices": "",
+      "confirmText-confirm-logout": "",
+      "confirmText-force-logout": "",
       "title-force-logout-from-all-devices": "Vynutit odhlášení ze všech zařízení"
     },
+    "change-org-button": {
+      "confirmText-save": ""
+    },
     "edit-org": {
       "access-denied": "Nemáte oprávnění k prohlížení uživatelů v této organizaci. Chcete-li aktualizovat tuto organizaci, obraťte se na správce serveru.",
       "heading": "Upravit organizaci",
@@ -208,9 +216,11 @@
       "not-editable": "Tuto uživatelskou roli nelze upravovat, protože je synchronizována s vaším poskytovatelem ověření. Podrobnosti najdete v <1>dokumentaci k ověření Grafana</1>."
     },
     "org-users-table": {
+      "body-delete": "",
       "columns": {
         "aria-label-role": "Role"
       },
+      "confirmText-delete": "",
       "delete-aria-label": "Odstranit uživatele: {{name}}",
       "title-delete": "Odstranit"
     },
@@ -241,6 +251,9 @@
     "settings": {
       "info-description": "Tato systémová nastavení jsou definována v grafana.ini nebo custom.ini (nebo přepsána v proměnných ENV). Chcete-li je změnit, musíte restartovat Grafanu."
     },
+    "un-themed-org-row": {
+      "confirmText-confirm-removal": ""
+    },
     "upgrade-info": {
       "title": "Licence Enterprise"
     },
@@ -293,12 +306,17 @@
     },
     "user-permissions": {
       "change-button": "Změnit",
+      "confirmText-change": "",
       "grafana-admin-key": "Správce Grafana",
       "grafana-admin-no": "Ne",
       "grafana-admin-yes": "Ano",
       "title": "Oprávnění"
     },
     "user-profile": {
+      "body-delete": "",
+      "body-disable": "",
+      "confirmText-delete-user": "",
+      "confirmText-disable-user": "",
       "delete-button": "Odstranit uživatele",
       "disable-button": "Deaktivovat uživatele",
       "edit-button": "Upravit",
@@ -312,6 +330,9 @@
       "title-delete-user": "Odstranit uživatele",
       "title-disable-user": "Zakázat uživatele"
     },
+    "user-profile-row": {
+      "confirmText-save": ""
+    },
     "user-sessions": {
       "browser-column": "Prohlížeč a operační systém",
       "force-logout-all-button": "Vynutit odhlášení ze všech zařízení",
@@ -469,6 +490,9 @@
       "label-muting-grouping-and-timings-optional": "Ztlumení, seskupení a časování (nepovinné)",
       "title-muting-grouping-and-timings": "Ztlumení, seskupení a časování"
     },
+    "alert-manager-picker": {
+      "noOptionsMessage-no-datasources-found": ""
+    },
     "alert-menu": {
       "copy-link": "Kopírovat odkaz",
       "duplicate": "Duplikovat",
@@ -558,6 +582,7 @@
       "view-configuration": "Zobrazit konfiguraci"
     },
     "alertmanager-config": {
+      "confirmText-yes-reset-configuration": "",
       "gma-manual-configuration-description": "Interní konfiguraci správce výstrah Grafana nelze ručně změnit. Chcete-li změnit tuto konfiguraci, upravte jednotlivé zdroje přes uživatelské rozhraní.",
       "gma-manual-configuration-is-not-supported": "Ruční změny konfigurace nejsou podporovány",
       "message": {
@@ -572,11 +597,13 @@
       "title-resetting-alertmanager-configuration": "Probíhá obnovení konfigurace správce výstrah"
     },
     "alertmanager-configuration-version-manager": {
+      "body-restore-configuration-version-unsaved-changes": "",
       "columns": {
         "compare": "Porovnat",
         "restore": "Obnovit",
         "text-latest": "Nejnovější"
       },
+      "confirmText-yes-restore-configuration": "",
       "loading": "Načítání…",
       "no-previous-configurations": "Žádné předchozí konfigurace",
       "this-might-take-a-while": "Může to chvíli trvat…",
@@ -856,8 +883,10 @@
     },
     "contact-point-header": {
       "aria-label-more-actions": "Další akce pro kontaktní bod „{{contactPointName}}“",
+      "ariaLabel-delete": "",
       "button-edit": "Upravit",
       "button-view": "Zobrazit",
+      "export-ariaLabel-export": "",
       "export-label-export": "Exportovat",
       "label-delete": "Odstranit",
       "label-manage-permissions": "Spravovat oprávnění",
@@ -1396,6 +1425,7 @@
       "label-disable-resolved-message": "Zakázat vyřešenou zprávu"
     },
     "grafana-evaluation-behavior-step": {
+      "loadingMessage-loading-groups": "",
       "message": {
         "must-be-a-positive-integer": "Musí být kladné celé číslo.",
         "must-enter-a-group-name": "Musíte zadat název skupiny"
@@ -1856,7 +1886,11 @@
             "other-data-sources": "Ostatní zdroje dat"
           }
         }
-      }
+      },
+      "noOptionsMessage-no-datasources-found": ""
+    },
+    "mute-timing-actions-button": {
+      "body-delete-mute-timing": ""
     },
     "mute-timing-actions-buttons": {
       "text-disabled": "Zakázáno",
@@ -2109,9 +2143,11 @@
       "update-errors": {
         "conflict": "Strom zásad oznamování byl aktualizován jiným uživatelem.",
         "error-code": "Chybová zpráva: „{{error}}“",
-        "fallback": "Při aktualizaci vašich zásad oznamování se něco pokazilo.",
+        "routes": {
+          "conflictingMatchers": ""
+        },
         "suffix": "Aktualizujte stránku a zkuste to znovu.",
-        "title": "Chyba při ukládání zásady oznamování"
+        "title": ""
       },
       "n-more-policies_one": "{{count}} další zásady",
       "n-more-policies_few": "{{count}} další zásady",
@@ -2169,6 +2205,7 @@
     "query-and-expressions-step": {
       "add-query": "Přidat dotaz",
       "body-queries-expressions-configured": "Vytvořte alespoň jeden dotaz nebo výraz, na který chcete být upozorněni",
+      "confirmText-deactivate": "",
       "expressions": "Výrazy",
       "loading-data-sources": "Načítání zdrojů dat…",
       "manipulate-returned-queries-other-operations": "Spravujte data získaná z dotazů pomocí matematických a dalších operací.",
@@ -2236,6 +2273,7 @@
     "redirect-to-clone-rule": {
       "body-evaluation-group": "Pro zkopírované pravidlo budete muset nastavit novou hodnotící skupinu, protože původní skupina byla zajištěna a nelze ji použít pro pravidla vytvořená v uživatelském rozhraní.",
       "body-not-provisioned": "Nové pravidlo <1>nebude</1> označeno jako zajištěné pravidlo.",
+      "confirmText-copy": "",
       "title-copy-provisioned-alert-rule": "Kopírovat zajištěné pravidlo výstrahy"
     },
     "redirect-to-rule-viewer": {
@@ -2435,8 +2473,6 @@
       "title-inspect-alert-rule": "Zkontrolovat pravidlo výstrahy"
     },
     "rule-list": {
-      "cannot-find-rule-details-for": "Nelze najít podrobnosti o pravidle pro UID {{uid}}",
-      "cannot-load-rule-details-for": "Nelze načíst podrobnosti o pravidle pro UID {{uid}}",
       "configure-datasource": "Konfigurovat",
       "draft-new-rule": "Navrhnout nové pravidlo",
       "ds-error": {
@@ -2792,6 +2828,9 @@
       "existing-templates-selector-placeholder-choose-notification-template": "Vyberte šablonu oznámení",
       "loading": "Načítání…",
       "template-options": {
+        "ariaLabel": {
+          "select-notification-template": ""
+        },
         "label": {
           "select-notification-template": "Vyberte šablonu oznámení"
         }
@@ -2818,6 +2857,8 @@
     },
     "templates-table": {
       "actions": "Akce",
+      "body-delete-template-group": "",
+      "confirmText-yes-delete": "",
       "no-templates-defined": "Nejsou definovány žádné šablony.",
       "template-group": "Skupina šablony",
       "title-delete-template-group": "Odstranit skupinu šablon"
@@ -2945,6 +2986,11 @@
         "title-delete-contact-point": "Odstranit kontaktní bod"
       }
     },
+    "use-delete-modal": {
+      "modal": {
+        "confirmText-yes-delete": ""
+      }
+    },
     "use-delete-policy-modal": {
       "modal-element": {
         "title-delete-notification-policy": "Odstranit zásadu oznamování"
@@ -3101,7 +3147,8 @@
     "annotation-field-mapper": {
       "annotation": "Anotace",
       "first-value": "První hodnota",
-      "from": ""
+      "from": "",
+      "noOptionsMessage-unknown-field-names": ""
     },
     "empty-state": {
       "button-title": "Přidat dotaz na vysvětlivky",
@@ -3235,7 +3282,7 @@
       "team-ids-github": "Celočíselný seznam ID týmů.",
       "team-ids-label": "ID týmů",
       "team-ids-numbers": "ID týmů musí být čísla.",
-      "team-ids-other": "Řetězcový seznam ID týmu.",
+      "team-ids-other": "",
       "team-ids-placeholder": "Zadejte ID týmů a stiskněte klávesu Enter pro přidání",
       "teams-url-description": "Adresa URL použitá k dotazu na ID týmů. Pokud není nastavena, výchozí hodnota je /teams.",
       "teams-url-description-oauth": "Pokud nakonfigurujete „{{ teamsURLLabel }}“, musíte také nakonfigurovat „{{ teamIDsAttributePathLabel }}“.",
@@ -3279,6 +3326,7 @@
       "additional-actions-menu": {
         "label-reset-to-default-values": "Obnovit výchozí hodnoty"
       },
+      "confirmText-reset": "",
       "disable": "Zakázat",
       "disabling": "Probíhá zakazování…",
       "discard": "Zahodit",
@@ -4216,8 +4264,8 @@
     }
   },
   "dashbaord-scene": {
-    "interval-variable-form": {
-      "description-auto-option": "Dynamicky vypočítá interval vydělením časového rozsahu zadaným počtem"
+    "variable-editor-form": {
+      "run-query": ""
     }
   },
   "dashboard": {
@@ -4379,6 +4427,9 @@
     },
     "dash-nav": {
       "on-open-snapshot-original": {
+        "confirmText": {
+          "proceed": ""
+        },
         "title": {
           "proceed-to-external-site": "Přejít na externí stránku?"
         }
@@ -4593,6 +4644,13 @@
           "editable": "Upravitelné",
           "readonly": "Jen pro čtení"
         }
+      },
+      "graph_tooltip_options": {
+        "label": {
+          "default": "",
+          "shared-crosshair": "",
+          "shared-tooltip": ""
+        }
       }
     },
     "get-debug-dashboard": {
@@ -4899,6 +4957,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "Opravdu chcete obnovit nástěnku na verzi {{version}}? Veškeré neuložené změny budou ztraceny.",
+      "confirmText-restore-version": "",
       "title-restore-version": "Obnovit verzi"
     },
     "row-options-button": {
@@ -4949,6 +5008,9 @@
         "title-not-unique": "Tento název není jedinečný"
       }
     },
+    "save-dashboard": {
+      "message-dashboard-saved": ""
+    },
     "save-dashboard-as-button": {
       "save-as": "Uložit jako"
     },
@@ -4983,6 +5045,7 @@
     "save-dashboard-error-proxy": {
       "body-name-exists": "Ve vybrané složce už existuje nástěnka se stejným názvem.<1></1><2>Chcete přesto tuto nástěnku uložit?</2>",
       "body-version-mismatch": "Tuto nástěnku aktualizoval jiný uživatel<1></1><2>Chcete přesto tuto nástěnku uložit?</2>",
+      "confirmText-save-and-overwrite": "",
       "title-name-exists": "Konflikt",
       "title-version-mismatch": "Konflikt"
     },
@@ -5179,7 +5242,9 @@
       "label-apply-transformation-to": "Použít transformaci na"
     },
     "transformation-operation-row": {
+      "body-delete": "",
       "render-actions": {
+        "confirmText-delete": "",
         "title-debug": "Ladění",
         "title-disable-transformation": "Zakázat transformaci",
         "title-filter": "Filtrovat",
@@ -5201,10 +5266,14 @@
       "show-images": "Zobrazit obrázky",
       "title-add-another-transformation": "Přidejte další transformaci"
     },
+    "un-theme-transformations-editor": {
+      "body-delete-all-transformations": ""
+    },
     "un-themed-transformations-editor": {
       "actions": {
         "add-another-transformation": "Přidejte další transformaci"
       },
+      "confirmText-delete-all": "",
       "delete-all-transformations": "Odstranit všechny transformace",
       "title-delete-all-transformations": "Odstranit všechny transformace?",
       "tooltip-clear-search": "Vymazat vyhledávání",
@@ -5241,6 +5310,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "Přepnout výběr verze {{version}}",
       "date": "Datum",
+      "name-latest": "",
       "notes": "Poznámky",
       "restore": "Obnovit",
       "updated-by": "Aktualizoval/a",
@@ -5317,7 +5387,8 @@
       "description-enables-users-custom-values": "Umožňuje uživatelům přidávat vlastní hodnoty do seznamu",
       "description-provide-dimensions-as-csv-dimension-name-dimension-id": "Zadejte rozměry ve formátu CSV: {{name}}, {{value}}",
       "label-data-source": "Zdroj dat",
-      "label-use-static-key-dimensions": "Použít dimenze statického klíče"
+      "label-use-static-key-dimensions": "Použít dimenze statického klíče",
+      "name-allow-custom-values": ""
     },
     "add-to-dashboard": {
       "message": {
@@ -5390,6 +5461,9 @@
       }
     },
     "config-public-dashboard": {
+      "confirmText": {
+        "revoke-public-url": ""
+      },
       "title": {
         "revoke-public-url": "Odvolat veřejnou adresu URL"
       }
@@ -5401,6 +5475,7 @@
     },
     "custom-variable-form": {
       "custom-options": "Vlastní možnosti",
+      "name-values-separated-comma": "",
       "selection-options": "Možnosti výběru"
     },
     "dashboard-edit-pane-renderer": {
@@ -5419,6 +5494,12 @@
       "label-type": "Typ",
       "label-url": "URL",
       "label-with-tags": "S tagy",
+      "link-type-options": {
+        "label": {
+          "dashboards": "",
+          "link": ""
+        }
+      },
       "placeholder-open-dashboard": "Otevřít nástěnku"
     },
     "dashboard-link-list": {
@@ -5465,6 +5546,8 @@
       "data-source-options": "Možnosti zdroje dat",
       "description-instance-name-filter": "Filtr regulárních výrazů, pro které můžete vybrat instance zdroje dat v seznamu hodnot proměnných. Ponechte prázdné pro vše.",
       "example-instance-name-filter": "Příklad: <codeExample />",
+      "name-instance-name-filter": "",
+      "name-type": "",
       "selection-options": "Možnosti výběru"
     },
     "default-grid-layout-manager": {
@@ -5510,6 +5593,21 @@
     "empty-transformations-message": {
       "add-transformation": "Přidat transformaci"
     },
+    "general-settings-edit-view": {
+      "editable_options": {
+        "label": {
+          "editable": "",
+          "readonly": ""
+        }
+      },
+      "graph_tooltip_options": {
+        "label": {
+          "default": "",
+          "shared-crosshair": "",
+          "shared-tooltip": ""
+        }
+      }
+    },
     "get-edit-options": {
       "title": {
         "column-options": "Možnosti sloupce",
@@ -5540,7 +5638,8 @@
       "description-provide-dimensions-as-csv-dimension-name-dimension-id": "Zadejte rozměry ve formátu CSV: {{name}}, {{value}}",
       "group-by-options": "Možnosti Seřadit podle",
       "label-data-source": "Zdroj dat",
-      "label-use-static-group-by-dimensions": "Použít rozměry statické skupiny"
+      "label-use-static-group-by-dimensions": "Použít rozměry statické skupiny",
+      "name-allow-custom-values": ""
     },
     "help-wizard": {
       "copy-to-clipboard": "Kopírovat do schránky",
@@ -5576,9 +5675,14 @@
       "apply": "Použít"
     },
     "interval-variable-form": {
+      "description-auto-option": "",
       "description-calculated-value-below-threshold": "Vypočtená hodnota neklesne pod tuto prahovou hodnotu",
       "description-step-count": "Kolikrát by měl být aktuální časový rozsah rozdělen pro výpočet hodnoty",
-      "interval-options": "Možnosti intervalu"
+      "interval-options": "Možnosti intervalu",
+      "name-auto-option": "",
+      "name-min-interval": "",
+      "name-step-count": "",
+      "name-values": ""
     },
     "json-model-edit-view": {
       "cancel-button": {
@@ -5605,6 +5709,9 @@
       "title-name-already-exists": "Název již existuje"
     },
     "on-open-snapshot-original-dashboard": {
+      "confirmText": {
+        "proceed": ""
+      },
       "title": {
         "proceed-to-external-site": "Přejít na externí stránku?"
       }
@@ -5640,6 +5747,8 @@
     },
     "panel-data-transformations-tab-rendered": {
       "add-another-transformation": "Přidejte další transformaci",
+      "body-delete-all-transformations": "",
+      "confirmText-delete-all": "",
       "delete-all-transformations": "Odstranit všechny transformace",
       "title-delete-all-transformations": "Odstranit všechny transformace?"
     },
@@ -5693,6 +5802,7 @@
       "description-optional": "Volitelné, pokud chcete extrahovat část názvu řady nebo segmentu uzlu metriky.",
       "label-data-source": "Zdroj dat",
       "label-target-data-source": "Cílový zdroj dat",
+      "name-regex": "",
       "query-options": "Možnosti dotazu",
       "selection-options": "Možnosti výběru"
     },
@@ -5707,6 +5817,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "Opravdu chcete obnovit nástěnku na verzi {{version}}? Veškeré neuložené změny budou ztraceny.",
+      "confirmText-restore-version": "",
       "title-restore-version": "Obnovit verzi"
     },
     "save-button": {
@@ -5802,7 +5913,11 @@
     "selection-options-form": {
       "description-enables-multiple-values-selected": "Umožňuje vybrat více hodnot současně",
       "description-enables-option-include-variables": "Povoluje možnost zahrnout všechny hodnoty",
-      "description-enables-users-custom-values": "Umožňuje uživatelům přidávat vlastní hodnoty do seznamu"
+      "description-enables-users-custom-values": "Umožňuje uživatelům přidávat vlastní hodnoty do seznamu",
+      "name-allow-custom-values": "",
+      "name-custom-all-value": "",
+      "name-include-all-option": "",
+      "name-multi-value": ""
     },
     "share-button": {
       "aria-label-sharedropdownmenu": "Přepnout nabídku sdílení"
@@ -5822,6 +5937,9 @@
         "copy-to-clipboard-failed": "Kopírování do schránky se nezdařilo"
       }
     },
+    "text-box-variable": {
+      "name-default-value": ""
+    },
     "text-box-variable-form": {
       "placeholder-default-value-if-any": "(volitelné)",
       "text-options": "Možnosti textu"
@@ -5845,6 +5963,8 @@
       }
     },
     "unlink-modal": {
+      "body-unlink-panel": "",
+      "confirmText-yes-unlink": "",
       "title-really-unlink-panel": "Opravdu chcete tento panel odpojit?"
     },
     "unsaved-changes-modal": {
@@ -5861,6 +5981,9 @@
         }
       }
     },
+    "use-save-dashboard": {
+      "message-dashboard-saved": ""
+    },
     "variable-check-indicator": {
       "aria-label-variable-referenced-dashboard": "Na tuto proměnnou neodkazuje žádná proměnná ani nástěnka.",
       "aria-label-variable-referenced-other-variables-dashboard": "Na tuto proměnnou odkazují jiné proměnné nebo nástěnka.",
@@ -5870,10 +5993,16 @@
     "variable-editor-form": {
       "aria-label-variable-editor-form": "Formulář editoru proměnné",
       "back-to-list": "Zpět na seznam",
+      "confirmText": {
+        "delete-variable": ""
+      },
       "delete": "Odstranit",
       "description-optional-display-name": "Nepovinné zobrazované jméno",
       "description-template-variable-characters": "Název proměnné šablony. (max. 50 znaků)",
       "general": "Obecné",
+      "name-description": "",
+      "name-label": "",
+      "name-name": "",
       "placeholder-descriptive-text": "Popisný text",
       "placeholder-label-name": "Název štítku",
       "placeholder-variable-name": "Název proměnné",
@@ -5888,13 +6017,25 @@
       "variable": "Proměnná"
     },
     "variable-editor-list-row": {
+      "body-delete-variable": "",
+      "confirmText-delete-variable": "",
       "title-delete-variable": "Odstranit proměnnou",
       "tooltip-duplicate-variable": "Duplikovat proměnnou",
       "tooltip-remove-variable": "Odebrat proměnnou"
     },
     "variable-hide-select": {
+      "hide_options": {
+        "label": {
+          "label": "",
+          "nothing": "",
+          "variable": ""
+        }
+      },
       "label": "Skrýt"
     },
+    "variable-type-select": {
+      "name-variable-type": ""
+    },
     "variable-usages-button": {
       "title-show-usages": "Zobrazuje se použití pro: {{variableId}}",
       "tooltip-show-usages": "Zobrazit použití"
@@ -5921,6 +6062,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "Přepnout výběr verze {{version}}",
       "date": "Datum",
+      "name-latest": "",
       "notes": "Poznámky",
       "restore": "Obnovit",
       "updated-by": "Aktualizoval/a",
@@ -6308,7 +6450,8 @@
       }
     },
     "color-dimension-editor": {
-      "label-fixed-color": ""
+      "label-fixed-color": "",
+      "noOptionsMessage-no-fields-found": ""
     },
     "file-dropzone-custom-children": {
       "upload": "Nahrát"
@@ -6346,6 +6489,7 @@
       },
       "label-limit": "Limit",
       "label-value": "Hodnota",
+      "noOptionsMessage-no-fields-found": "",
       "scalar-options": {
         "description-clamped": "",
         "description-mod": "",
@@ -6354,9 +6498,15 @@
       }
     },
     "scale-dimension-editor": {
+      "fixed-value-option": {
+        "label": {
+          "fixed-value": ""
+        }
+      },
       "label-max": "Max.",
       "label-min": "Min.",
-      "label-value": "Hodnota"
+      "label-value": "Hodnota",
+      "noOptionsMessage-no-fields-found": ""
     },
     "text-dimension-editor": {
       "description-field": "",
@@ -6928,6 +7078,8 @@
       "aria-label-select-service-name-operator": "Vyberte operátor názvu služby",
       "aria-label-select-span-name": "Vyberte název rozsahu",
       "aria-label-select-span-name-operator": "Vyberte operátor názvu rozsahu",
+      "ariaLabel-select-max-span-duration": "",
+      "ariaLabel-select-min-span-duration": "",
       "label-collapse": "Filtry rozsahu",
       "label-duration": "Doba trvání",
       "label-service-name": "Název služby",
@@ -6998,6 +7150,8 @@
       "split-widen": "Rozšířit podokno"
     },
     "trace-page-actions": {
+      "ariaLabel-copy-trace-id": "",
+      "ariaLabel-export-trace": "",
       "give-feedback": "Poskytnout zpětnou vazbu",
       "label-copied": "Zkopírováno!",
       "label-export": "Exportovat",
@@ -7135,6 +7289,7 @@
   },
   "folder-filter": {
     "clear-folder-button": "Vymazat složky",
+    "noOptionsMessage-no-folders-found": "",
     "select-aria-label": "Filtr složky",
     "select-placeholder": "Filtrovat podle složky"
   },
@@ -7203,7 +7358,53 @@
     "incomplete-request-error": "Je mi líto, ale vaši žádost se mi nepodařilo dokončit. Zkuste to znovu.",
     "send-custom-feedback": "Odeslat"
   },
+  "geo": {
+    "get-geometry-field": {
+      "warning-gazetteer-not-found": "",
+      "warning-no-geometry": "",
+      "warning-select-geohash": "",
+      "warning-select-lat-long": "",
+      "warning-select-lookup": "",
+      "warning-unable-to-find": ""
+    },
+    "location-editor": {
+      "geohash-field": {
+        "no-fields-message": ""
+      },
+      "latitude-field": {
+        "no-fields-message": ""
+      },
+      "longitude-field": {
+        "no-fields-message": ""
+      },
+      "lookup-field": {
+        "no-fields-message": ""
+      },
+      "name-gazetteer": "",
+      "name-geohash-field": "",
+      "name-latitude-field": "",
+      "name-location-mode": "",
+      "name-longitude-field": "",
+      "name-lookup-field": ""
+    },
+    "location-more-editor": {
+      "mode-options": {
+        "description-auto": "",
+        "description-coords": "",
+        "description-geohash": "",
+        "description-lookup": "",
+        "label-auto": "",
+        "label-coords": "",
+        "label-geohash": "",
+        "label-lookup": ""
+      }
+    }
+  },
   "geomap": {
+    "category-basemap-layer": "",
+    "category-map-controls": "",
+    "category-map-layers": "",
+    "category-map-view": "",
     "coordinates-map-view-editor": {
       "label-latitude": "Zeměpisná šířka",
       "label-longitude": "Zeměpisná délka"
@@ -7212,6 +7413,14 @@
       "center": "Střed:",
       "zoom": "Přiblížení:"
     },
+    "description-initial-view": "",
+    "description-mouse-wheel-zoom": "",
+    "description-share-view": "",
+    "description-show-attribution": "",
+    "description-show-debug": "",
+    "description-show-measure": "",
+    "description-show-scale": "",
+    "description-show-zoom": "",
     "fit-map-view-editor": {
       "all-layers-editor-fragment": {
         "label-layer": "Vrstva"
@@ -7234,6 +7443,14 @@
     "geomap-style-rules-editor": {
       "aria-label-add-geomap-style-rule": "Přidat pravidlo stylu geomapy"
     },
+    "layer-editor": {
+      "category-base-layer": "",
+      "description-display-tooltip": "",
+      "name-data": "",
+      "name-display-tooltip": "",
+      "name-layer-type": "",
+      "name-opacity": ""
+    },
     "layers-editor": {
       "label-add-layer": "Přidat vrstvu",
       "no-layers": "Žádné vrstvy?"
@@ -7244,16 +7461,38 @@
       "label-zoom": "Přiblížení",
       "use-current-map-settings": "Použít aktuální nastavení mapy"
     },
+    "markers-layer": {
+      "description-show-legend": "",
+      "name-show-legend": "",
+      "name-styles": ""
+    },
     "markers-legend": {
       "title-symbol": "Symbol"
     },
     "measure-overlay": {
       "tooltip-show-measure-tools": "Zobrazit nástroje pro měření"
     },
+    "name-initial-view": "",
+    "name-mouse-wheel-zoom": "",
+    "name-share-view": "",
+    "name-show-attribution": "",
+    "name-show-debug": "",
+    "name-show-measure": "",
+    "name-show-scale": "",
+    "name-show-zoom": "",
+    "name-tooltip": "",
+    "photos-layer": {
+      "noFieldsMessage-no-string-fields": ""
+    },
     "plugin": {
       "basemap-layer-configured-server-admin": "Vrstvu základní mapy konfiguruje správce serveru."
     },
     "style-editor": {
+      "horizontal-align-options": {
+        "label-center": "",
+        "label-left": "",
+        "label-right": ""
+      },
       "label-align": "Zarovnat",
       "label-baseline": "Základní linie",
       "label-color": "Barva",
@@ -7267,7 +7506,14 @@
       "label-symbol-vertical-align": "Svislé zarovnání symbolu",
       "label-text-label": "Štítek textu",
       "label-x-offset": "Posun X",
-      "label-y-offset": "Posun Y"
+      "label-y-offset": "Posun Y",
+      "placeholderText-select-symbol": "",
+      "placeholderText-select-symbol-or-add-text": "",
+      "vertical-align-options": {
+        "label-bottom": "",
+        "label-center": "",
+        "label-top": ""
+      }
     },
     "style-rule-editor": {
       "aria-label-comparison-operator": "Operátor porovnání",
@@ -7278,6 +7524,15 @@
       "placeholder-feature-property": "Oblíbená vlastnost",
       "placeholder-numeric-value": "Číselná hodnota",
       "placeholder-value": "hodnota"
+    },
+    "tooltip-options": {
+      "description-details": "",
+      "description-none": "",
+      "label-details": "",
+      "label-none": ""
+    },
+    "utils": {
+      "get-next-layer-name": ""
     }
   },
   "get-enterprise": {
@@ -7527,7 +7782,8 @@
       "aria-label-selected-color": "{{colorLabel}} barva"
     },
     "confirm-button": {
-      "cancel": "Zrušit"
+      "cancel": "Zrušit",
+      "confirmText-delete": ""
     },
     "confirm-content": {
       "placeholder": "Napište „{{confirmPromptText}}“ pro potvrzení"
@@ -7709,6 +7965,8 @@
     },
     "panel-chrome": {
       "aria-label-toggle-collapse": "přepnout sbalení panelu",
+      "ariaLabel-panel-loading": "",
+      "ariaLabel-panel-status": "",
       "tooltip-cancel": "Zrušit dotaz",
       "tooltip-cancel-loading": "Zrušit dotaz",
       "tooltip-stop-streaming": "Zastavit streamování",
@@ -7876,6 +8134,12 @@
       "footer-click-to-action": "Klikněte pro {{actionTitle}}",
       "footer-click-to-navigate": "Klikněte pro otevření {{linkTitle}}",
       "timestamp": "Časová známka"
+    },
+    "week-start-picker": {
+      "weekStarts-label-default": "",
+      "weekStarts-label-monday": "",
+      "weekStarts-label-saturday": "",
+      "weekStarts-label-sunday": ""
     }
   },
   "graph": {
@@ -8258,6 +8522,10 @@
     "add-library-panel-modal": {
       "title-create-library-panel": "Vytvořit panel knihovny"
     },
+    "change-library-panel-modal": {
+      "confirmText-change": "",
+      "confirmText-replace": ""
+    },
     "confirm": {
       "delete-panel": "Chcete tento panel odstranit?"
     },
@@ -8708,6 +8976,8 @@
       "updated-on": "Aktualizováno dne"
     },
     "snapshot-list-table": {
+      "body-delete": "",
+      "confirmText-delete": "",
       "title-delete": "Odstranit"
     },
     "unthemed-dashboard-import": {
@@ -8719,6 +8989,9 @@
       }
     }
   },
+  "metric-select": {
+    "noOptionsMessage-no-options-found": ""
+  },
   "migrate-to-cloud": {
     "build-snapshot": {
       "description": "Tento nástroj může migrovat některé zdroje z této instalace do cloudové sady. Chcete-li začít, vytvořte snímek této instalace. Vytvoření snímku obvykle trvá méně než dvě minuty. Snímek je uložen spolu s touto instalací Grafana.",
@@ -9417,7 +9690,7 @@
     "marker": {
       "100-node-count": ">100 uzlů",
       "aria-label-hidden-marker": "Značka skrytých uzlů: {{marker}}",
-      "node-count_one": "{{count}} uzel",
+      "node-count_one": "Uzly: {{count}}",
       "node-count_few": "Uzly: {{count}}",
       "node-count_many": "Uzly: {{count}}",
       "node-count_other": "Uzly: {{count}}"
@@ -9430,11 +9703,11 @@
       "aria-label-nodes-hidden-warning": "Varování na skryté uzly",
       "computing-layout": "Výpočet rozvržení",
       "no-data": "Žádná data",
-      "hidden-nodes_one": "<0></0> {{count}} uzel je skrytý z důvodu výkonu.",
+      "hidden-nodes_one": "<0></0>Některé uzly ({{count}}) jsou skryté z důvodu výkonu.",
       "hidden-nodes_few": "<0></0>Některé uzly ({{count}}) jsou skryté z důvodu výkonu.",
       "hidden-nodes_many": "<0></0>Některé uzly ({{count}}) jsou skryté z důvodu výkonu.",
       "hidden-nodes_other": "<0></0>Některé uzly ({{count}}) jsou skryté z důvodu výkonu.",
-      "processed-nodes_one": "<0></0> Vrstvené rozložení může být pomalé s {{count}} uzlem.",
+      "processed-nodes_one": "<0></0> Vrstvené rozložení může být pomalé s více uzly ({{count}}).",
       "processed-nodes_few": "<0></0> Vrstvené rozložení může být pomalé s více uzly ({{count}}).",
       "processed-nodes_many": "<0></0> Vrstvené rozložení může být pomalé s více uzly ({{count}}).",
       "processed-nodes_other": "<0></0> Vrstvené rozložení může být pomalé s více uzly ({{count}})."
@@ -9563,6 +9836,7 @@
     }
   },
   "org-picker": {
+    "noOptionsMessage-no-organizations-found": "",
     "select-placeholder": "Vyberte organizaci"
   },
   "page": {
@@ -9785,6 +10059,7 @@
         "permission": "Nemáte oprávnění pro zobrazení této stránky.",
         "title-access-denied": "Přístup nebyl povolen"
       },
+      "error-loading-plugin": "",
       "no-root-app-page-component-found": "Nebyla nalezena žádná kořenová komponenta stránky aplikace"
     },
     "browse": {
@@ -9828,8 +10103,7 @@
         "update-status-text": "pluginy byly aktualizovány"
       },
       "versions": {
-        "confirmation-text-1": "Opravdu chcete přejít na nižší verzi",
-        "confirmation-text-2": "Normálně byste to neměli dělat",
+        "confirmation-text": "",
         "downgrade-confirm": "Přejít na nižší verzi",
         "downgrade-title": "Přejít na nižší verzi pluginu"
       }
@@ -9883,6 +10157,10 @@
     "empty-state": {
       "message": "Nebyly nalezeny žádné pluginy"
     },
+    "extensions": {
+      "extension-error-alert-description": "",
+      "extension-error-alert-title": ""
+    },
     "extensions-log-data-source": {
       "message": {
         "ok": "OK"
@@ -9916,7 +10194,11 @@
       "updating": "Probíhá aktualizace"
     },
     "install-controls-button": {
-      "title-uninstall-modal": "Odinstalovat plugin {{plugin}}"
+      "title-uninstall-modal": "Odinstalovat plugin {{plugin}}",
+      "uninstall-controls": {
+        "body-uninstall-plugin": "",
+        "confirmText-confirm": ""
+      }
     },
     "install-controls-warning": {
       "body-not-published": "Tento plugin není publikován na <2>grafana.com/plugins</2> a nelze ho spravovat prostřednictvím katalogu.",
@@ -10962,6 +11244,7 @@
     }
   },
   "service-account-picker": {
+    "noOptionsMessage-no-service-accounts-found": "",
     "select-aria-label": "Volič účtu služby",
     "select-placeholder": "Začněte psát a vyhledejte účty služeb"
   },
@@ -11007,6 +11290,10 @@
     },
     "service-account-page-unconnected": {
       "add-service-account-token": "Přidat token účtu služby",
+      "body-delete-service-account": "",
+      "body-disable-service-account": "",
+      "confirmText-delete-service-account": "",
+      "confirmText-disable-service-account": "",
       "delete-service-account": "Odstranit účet služby",
       "disable-service-account": "Zakázat účet služby",
       "enable-service-account": "Povolit účet služby",
@@ -11033,6 +11320,7 @@
       "used-by": "Používá"
     },
     "service-account-profile-row": {
+      "confirmText-save": "",
       "edit": "Upravit"
     },
     "service-account-role-row": {
@@ -11046,10 +11334,18 @@
     },
     "service-accounts-list-page-unconnected": {
       "add-service-account": "Přidat účet služby",
+      "body-delete-with-tokens": "",
+      "body-disable-service-account": "",
+      "confirmText-delete": "",
+      "confirmText-disable-service-account": "",
       "placeholder-search-service-account-by-name": "Hledat účet služby podle názvu",
       "sub-title": "Účty služeb a jejich tokeny lze použít k autentizaci pomocí API Grafany. Další informace najdete v naší <2>dokumentaci.</2>",
       "title-delete-service-account": "Odstranit účet služby",
-      "title-disable-service-account": "Zakázat účet služby"
+      "title-disable-service-account": "Zakázat účet služby",
+      "body-delete_one": "",
+      "body-delete_few": "",
+      "body-delete_many": "",
+      "body-delete_other": ""
     },
     "token-expiration": {
       "content-this-token-has-expired": "Platnost tokenu vypršela",
@@ -11441,7 +11737,7 @@
       "label-never": ""
     },
     "status-history-panel": {
-      "too-many-points_one": "Příliš mnoho bodů pro správnou vizualizaci. <1></1>Aktualizujte dotaz pro získání méně bodů. <3></3>({{count}} bod byl přijat)",
+      "too-many-points_one": "Příliš mnoho bodů pro správnou vizualizaci. <1></1>Aktualizujte dotaz pro získání méně bodů. <3></3>(přijaté body: {{count}})",
       "too-many-points_few": "Příliš mnoho bodů pro správnou vizualizaci. <1></1>Aktualizujte dotaz pro získání méně bodů. <3></3>(přijaté body: {{count}})",
       "too-many-points_many": "Příliš mnoho bodů pro správnou vizualizaci. <1></1>Aktualizujte dotaz pro získání méně bodů. <3></3>(přijaté body: {{count}})",
       "too-many-points_other": "Příliš mnoho bodů pro správnou vizualizaci. <1></1>Aktualizujte dotaz pro získání méně bodů. <3></3>(přijaté body: {{count}})"
@@ -11588,6 +11884,7 @@
     "tag-option-label": "Možnost tagu"
   },
   "team-picker": {
+    "noOptionsMessage-no-teams-found": "",
     "select-aria-label": "Volič týmu",
     "select-placeholder": "Vyberte tým"
   },
@@ -11913,6 +12210,7 @@
     "convert-field-type-transformer-editor": {
       "aria-label-add-a-convert-field-type-transformer": "Přidat transformátor typu pole konverze",
       "aria-label-remove-convert-field-type-transformer": "Odebrat transformátor typu pole konverze",
+      "convert-field-type": "",
       "label": {
         "browser": "Prohlížeč",
         "utc": "UTC"
@@ -11955,6 +12253,11 @@
       "remove-enum-row-tooltip-delete": "Odstranit"
     },
     "extract-fields-transformer-editor": {
+      "field-name-picker-settings": {
+        "placeholderText": {
+          "select-field": ""
+        }
+      },
       "label-delimiter": "Oddělovač",
       "label-format": "Formát",
       "label-keep-time": "Ponechat čas",
@@ -11968,6 +12271,14 @@
       "aria-label-threshold-color": "Barva prahové hodnoty"
     },
     "field-lookup-transformer-editor": {
+      "field-name-picker-settings": {
+        "noFieldsMessage": {
+          "no-text-fields-found": ""
+        },
+        "placeholderText": {
+          "select-text-field": ""
+        }
+      },
       "label-field": "Pole",
       "label-lookup": "Vyhledávání"
     },
@@ -11993,10 +12304,30 @@
     },
     "filter-by-value-transformer-editor": {
       "add-condition": "Přidejte podmínku",
+      "filter-match": {
+        "label": {
+          "match-all": "",
+          "match-any": ""
+        }
+      },
+      "filter-types": {
+        "label": {
+          "exclude": "",
+          "include": ""
+        }
+      },
       "label-conditions": "Podmínky",
       "label-filter-type": "Typ filtru"
     },
     "format-string-transfomer-editor": {
+      "field-name-picker-settings": {
+        "noFieldsMessage": {
+          "no-text-fields-found": ""
+        },
+        "placeholderText": {
+          "select-text-field": ""
+        }
+      },
       "label-field": "Pole",
       "label-format": "Formát",
       "label-substring-range": "Rozsah dílčího řetězce"
@@ -12307,6 +12638,7 @@
     "title": "Organizace"
   },
   "user-picker": {
+    "noOptionsMessage-no-users-found": "",
     "select-aria-label": "Volič uživatelů",
     "select-placeholder": "Začněte psát a vyhledejte uživatele"
   },
@@ -12392,6 +12724,8 @@
       }
     },
     "confirm-delete-modal": {
+      "body-delete-variable": "",
+      "confirmText-delete": "",
       "title-delete-variable": "Odstranit proměnnou"
     },
     "create-ad-hoc-variable-adapter": {
@@ -12440,9 +12774,24 @@
       "label-refresh": "Obnovit"
     },
     "query-variable-sort-select": {
-      "description-values-variable": "Jak třídit hodnoty této proměnné"
+      "description-values-variable": "Jak třídit hodnoty této proměnné",
+      "name-sort": "",
+      "sort_options": {
+        "label": {
+          "alphabetical-asc": "",
+          "alphabetical-caseinsensitive-asc": "",
+          "alphabetical-caseinsensitive-desc": "",
+          "alphabetical-desc": "",
+          "disabled": "",
+          "natural-asc": "",
+          "natural-desc": "",
+          "numerical-asc": "",
+          "numerical-desc": ""
+        }
+      }
     },
     "text-box-variable-editor": {
+      "name-default-value": "",
       "placeholder-default-value-if-any": "výchozí hodnota, pokud existuje",
       "text-options": "Možnosti textu"
     },
@@ -12471,6 +12820,8 @@
       "description-optional-display-name": "Nepovinné zobrazované jméno",
       "description-template-variable-characters": "Název proměnné šablony. (max. 50 znaků)",
       "general": "Obecné",
+      "name-label": "",
+      "name-name": "",
       "placeholder-descriptive-text": "Popisný text",
       "placeholder-label-name": "Název štítku",
       "placeholder-variable-name": "Název proměnné",
@@ -12485,9 +12836,15 @@
       "tooltip-duplicate-variable": "Duplikovat proměnnou",
       "tooltip-remove-variable": "Odebrat proměnnou"
     },
+    "variable-editor-un-connected": {
+      "name-description": ""
+    },
     "variable-options": {
       "aria-label-toggle-all-values": "Přepnout všechny hodnoty"
     },
+    "variable-type-select": {
+      "name-select-variable-type": ""
+    },
     "variable-usages-button": {
       "tooltip-show-usages": "Zobrazit použití"
     },
diff --git a/public/locales/de-DE/grafana.json b/public/locales/de-DE/grafana.json
index 9d81611c46d..df7913debc3 100644
--- a/public/locales/de-DE/grafana.json
+++ b/public/locales/de-DE/grafana.json
@@ -84,6 +84,7 @@
     "admin-feature-toggles-table": {
       "confirm-modal-body-1": "Einige Funktionen sind stabil (GA) und standardmäßig aktiviert, während andere zurzeit in ihrer vorläufigen Beta-Phase sind und für eine frühzeitige Anwendung verfügbar sind.",
       "confirm-modal-body-2": "Wir raten Ihnen, die Auswirkungen jeder Funktionsänderung zu kennen, bevor Sie Änderungen vornehmen.",
+      "confirmText-save-changes": "",
       "get-stage-cell": {
         "beta": "Beta",
         "content-general-availability": "Allgemeine Verfügbarkeit",
@@ -96,14 +97,21 @@
     },
     "admin-orgs-table": {
       "aria-label-delete-org": "Organisation löschen",
+      "confirmText-delete": "",
       "title-delete": "Löschen"
     },
     "anon-users": {
       "not-found": "Keine anonymen Benutzer gefunden."
     },
     "base-user-sessions": {
+      "body-force-logout-from-all-devices": "",
+      "confirmText-confirm-logout": "",
+      "confirmText-force-logout": "",
       "title-force-logout-from-all-devices": "Abmeldung von allen Geräten erzwingen"
     },
+    "change-org-button": {
+      "confirmText-save": ""
+    },
     "edit-org": {
       "access-denied": "Sie sind nicht berechtigt, Benutzer in dieser Organisation anzuzeigen. Wenden Sie sich an Ihren Serveradministrator, um diese Organisation zu aktualisieren.",
       "heading": "Organisation bearbeiten",
@@ -208,9 +216,11 @@
       "not-editable": "Die Rolle dieses Benutzers kann nicht bearbeitet werden, da sie von Ihrem Authentifizierungsanbieter synchronisiert wird. Weitere Informationen finden Sie in den <1>Grafana-Authentifizierungsdokumenten</1>."
     },
     "org-users-table": {
+      "body-delete": "",
       "columns": {
         "aria-label-role": "Rolle"
       },
+      "confirmText-delete": "",
       "delete-aria-label": "Nutzer löschen: {{name}}",
       "title-delete": "Löschen"
     },
@@ -241,6 +251,9 @@
     "settings": {
       "info-description": "Diese Systemeinstellungen werden in grafana.ini oder custom.ini definiert (oder in ENV-Variablen überschrieben). Um diese zu ändern, müssen Sie Grafana jetzt neu starten."
     },
+    "un-themed-org-row": {
+      "confirmText-confirm-removal": ""
+    },
     "upgrade-info": {
       "title": "Enterprise-Lizenz"
     },
@@ -293,12 +306,17 @@
     },
     "user-permissions": {
       "change-button": "Ändern",
+      "confirmText-change": "",
       "grafana-admin-key": "Grafana-Admin",
       "grafana-admin-no": "Nein",
       "grafana-admin-yes": "Ja",
       "title": "Berechtigungen"
     },
     "user-profile": {
+      "body-delete": "",
+      "body-disable": "",
+      "confirmText-delete-user": "",
+      "confirmText-disable-user": "",
       "delete-button": "Benutzer löschen",
       "disable-button": "Benutzer deaktivieren",
       "edit-button": "Bearbeiten",
@@ -312,6 +330,9 @@
       "title-delete-user": "Benutzer löschen",
       "title-disable-user": "Nutzer deaktivieren"
     },
+    "user-profile-row": {
+      "confirmText-save": ""
+    },
     "user-sessions": {
       "browser-column": "Browser und Betriebssystem",
       "force-logout-all-button": "Abmeldung von allen Geräten erzwingen",
@@ -461,6 +482,9 @@
       "label-muting-grouping-and-timings-optional": "Stummschaltung, Gruppierung und Zeitsteuerung (optional)",
       "title-muting-grouping-and-timings": "Stummschaltung, Gruppierung und Zeitsteuerung"
     },
+    "alert-manager-picker": {
+      "noOptionsMessage-no-datasources-found": ""
+    },
     "alert-menu": {
       "copy-link": "Link kopieren",
       "duplicate": "Duplikat",
@@ -550,6 +574,7 @@
       "view-configuration": "Konfiguration anzeigen"
     },
     "alertmanager-config": {
+      "confirmText-yes-reset-configuration": "",
       "gma-manual-configuration-description": "Die interne Grafana-Alertmanager-Konfiguration kann nicht manuell geändert werden. Bearbeiten Sie die individuellen Ressourcen über die Benutzeroberfläche, um diese Konfiguration zu ändern.",
       "gma-manual-configuration-is-not-supported": "Manuelle Konfigurationsänderungen werden nicht unterstützt",
       "message": {
@@ -564,11 +589,13 @@
       "title-resetting-alertmanager-configuration": "Alertmanager-Konfiguration wird zurückgesetzt"
     },
     "alertmanager-configuration-version-manager": {
+      "body-restore-configuration-version-unsaved-changes": "",
       "columns": {
         "compare": "Vergleichen",
         "restore": "Wiederherstellen",
         "text-latest": "Neueste"
       },
+      "confirmText-yes-restore-configuration": "",
       "loading": "Wird geladen ...",
       "no-previous-configurations": "Keine vorherigen Konfigurationen",
       "this-might-take-a-while": "Dies kann eine Weile dauern ...",
@@ -848,8 +875,10 @@
     },
     "contact-point-header": {
       "aria-label-more-actions": "Weitere Aktionen für Kontaktpunkt „{{contactPointName}}“",
+      "ariaLabel-delete": "",
       "button-edit": "Bearbeiten",
       "button-view": "Anzeigen",
+      "export-ariaLabel-export": "",
       "export-label-export": "Exportieren",
       "label-delete": "Löschen",
       "label-manage-permissions": "Berechtigungen verwalten",
@@ -1384,6 +1413,7 @@
       "label-disable-resolved-message": "Nachricht zur Behebung deaktivieren"
     },
     "grafana-evaluation-behavior-step": {
+      "loadingMessage-loading-groups": "",
       "message": {
         "must-be-a-positive-integer": "Muss eine positive ganze Zahl sein.",
         "must-enter-a-group-name": "Es muss ein Gruppenname eingegeben werden"
@@ -1842,7 +1872,11 @@
             "other-data-sources": "Andere Datenquellen"
           }
         }
-      }
+      },
+      "noOptionsMessage-no-datasources-found": ""
+    },
+    "mute-timing-actions-button": {
+      "body-delete-mute-timing": ""
     },
     "mute-timing-actions-buttons": {
       "text-disabled": "Deaktiviert",
@@ -2093,9 +2127,11 @@
       "update-errors": {
         "conflict": "Der Benachrichtigungsrichtlinienbaum wurde von einem anderen Benutzer aktualisiert.",
         "error-code": "Fehlermeldung: „{{error}}“",
-        "fallback": "Beim Aktualisieren Ihrer Benachrichtigungsrichtlinien ist ein Fehler aufgetreten.",
+        "routes": {
+          "conflictingMatchers": ""
+        },
         "suffix": "Bitte aktualisieren Sie die Seite und versuchen Sie es erneut.",
-        "title": "Fehler beim Speichern der Benachrichtigungsrichtlinie"
+        "title": ""
       },
       "n-more-policies_one": "{{count}} zusätzliche Richtlinie",
       "n-more-policies_other": "{{count}} zusätzliche Richtlinien"
@@ -2151,6 +2187,7 @@
     "query-and-expressions-step": {
       "add-query": "Abfrage hinzufügen",
       "body-queries-expressions-configured": "Erstellen Sie mindestens eine Abfrage oder einen Ausdruck für eine Warnung",
+      "confirmText-deactivate": "",
       "expressions": "Ausdrücke",
       "loading-data-sources": "Datenquellen werden geladen ...",
       "manipulate-returned-queries-other-operations": "Manipulieren Sie Daten, die von Abfragen mit mathematischen und anderen Operationen zurückgegeben werden.",
@@ -2218,6 +2255,7 @@
     "redirect-to-clone-rule": {
       "body-evaluation-group": "Sie müssen eine neue Bewertungsgruppe für die kopierte Regel festlegen, da die ursprüngliche bereitgestellt wurde und nicht für Regeln genutzt werden kann, die in der Benutzeroberfläche erstellt werden.",
       "body-not-provisioned": "Die neue Regel wird <1>nicht</1> als bereitgestellte Regel gekennzeichnet.",
+      "confirmText-copy": "",
       "title-copy-provisioned-alert-rule": "Bereitgestellte Warnregel kopieren"
     },
     "redirect-to-rule-viewer": {
@@ -2415,8 +2453,6 @@
       "title-inspect-alert-rule": "Warnregel prüfen"
     },
     "rule-list": {
-      "cannot-find-rule-details-for": "Regeldetails für UID {{uid}} können nicht gefunden werden",
-      "cannot-load-rule-details-for": "Regeldetails für UID {{uid}} können nicht geladen werden",
       "configure-datasource": "Konfigurieren",
       "draft-new-rule": "Neue Regel entwerfen",
       "ds-error": {
@@ -2766,6 +2802,9 @@
       "existing-templates-selector-placeholder-choose-notification-template": "Benachrichtigungsvorlage auswählen",
       "loading": "Wird geladen ...",
       "template-options": {
+        "ariaLabel": {
+          "select-notification-template": ""
+        },
         "label": {
           "select-notification-template": "Benachrichtigungsvorlage auswählen"
         }
@@ -2792,6 +2831,8 @@
     },
     "templates-table": {
       "actions": "Aktionen",
+      "body-delete-template-group": "",
+      "confirmText-yes-delete": "",
       "no-templates-defined": "Keine Vorlagen festgelegt.",
       "template-group": "Vorlagengruppe",
       "title-delete-template-group": "Vorlagengruppe löschen"
@@ -2919,6 +2960,11 @@
         "title-delete-contact-point": "Kontaktpunkt löschen"
       }
     },
+    "use-delete-modal": {
+      "modal": {
+        "confirmText-yes-delete": ""
+      }
+    },
     "use-delete-policy-modal": {
       "modal-element": {
         "title-delete-notification-policy": "Benachrichtigungsrichtlinie löschen"
@@ -3075,7 +3121,8 @@
     "annotation-field-mapper": {
       "annotation": "Anmerkung",
       "first-value": "Erster Wert",
-      "from": ""
+      "from": "",
+      "noOptionsMessage-unknown-field-names": ""
     },
     "empty-state": {
       "button-title": "Anmerkungsabfrage hinzufügen",
@@ -3209,7 +3256,7 @@
       "team-ids-github": "Integer-Liste der Team-IDs.",
       "team-ids-label": "Team-IDs",
       "team-ids-numbers": "Team-IDs müssen Zahlen sein.",
-      "team-ids-other": "String-Liste der Team-IDs.",
+      "team-ids-other": "",
       "team-ids-placeholder": "Geben Sie Team-IDs ein und drücken Sie zum Hinzufügen die Eingabetaste",
       "teams-url-description": "Die URL, die für die Abfrage von Team-IDs verwendet wird. Wenn dies nicht festgelegt ist, lautet der Standardwert /teams.",
       "teams-url-description-oauth": "Wenn Sie „{{ teamsURLLabel }}“ konfigurieren, müssen Sie auch „{{ teamIDsAttributePathLabel }}“ konfigurieren.",
@@ -3253,6 +3300,7 @@
       "additional-actions-menu": {
         "label-reset-to-default-values": "Auf Standardwerte zurücksetzen"
       },
+      "confirmText-reset": "",
       "disable": "Deaktivieren",
       "disabling": "Wird deaktiviert …",
       "discard": "Verwerfen",
@@ -4180,8 +4228,8 @@
     }
   },
   "dashbaord-scene": {
-    "interval-variable-form": {
-      "description-auto-option": "Berechnet dynamisch das Intervall, indem der Zeitbereich durch die angegebene Anzahl dividiert wird"
+    "variable-editor-form": {
+      "run-query": ""
     }
   },
   "dashboard": {
@@ -4343,6 +4391,9 @@
     },
     "dash-nav": {
       "on-open-snapshot-original": {
+        "confirmText": {
+          "proceed": ""
+        },
         "title": {
           "proceed-to-external-site": "Weiter zu externer Seite?"
         }
@@ -4557,6 +4608,13 @@
           "editable": "Editierbar",
           "readonly": "Schreibgeschützt"
         }
+      },
+      "graph_tooltip_options": {
+        "label": {
+          "default": "",
+          "shared-crosshair": "",
+          "shared-tooltip": ""
+        }
       }
     },
     "get-debug-dashboard": {
@@ -4861,6 +4919,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "Sind Sie sicher, dass Sie das Dashboard auf die Version {{version}} zurücksetzen möchten? Alle nicht gespeicherten Änderungen gehen verloren.",
+      "confirmText-restore-version": "",
       "title-restore-version": "Version wiederherstellen"
     },
     "row-options-button": {
@@ -4911,6 +4970,9 @@
         "title-not-unique": "Dieser Titel ist nicht eindeutig"
       }
     },
+    "save-dashboard": {
+      "message-dashboard-saved": ""
+    },
     "save-dashboard-as-button": {
       "save-as": "Speichern unter"
     },
@@ -4945,6 +5007,7 @@
     "save-dashboard-error-proxy": {
       "body-name-exists": "Ein Dashboard mit demselben Namen im ausgewählten Ordner existiert bereits.<1></1><2>Möchten Sie dieses Dashboard trotzdem speichern?</2>",
       "body-version-mismatch": "Eine andere Person hat dieses Dashboard aktualisiert<1></1><2>Möchten Sie dieses Dashboard trotzdem speichern?</2>",
+      "confirmText-save-and-overwrite": "",
       "title-name-exists": "Widerspruch",
       "title-version-mismatch": "Widerspruch"
     },
@@ -5141,7 +5204,9 @@
       "label-apply-transformation-to": "Transformation anwenden auf"
     },
     "transformation-operation-row": {
+      "body-delete": "",
       "render-actions": {
+        "confirmText-delete": "",
         "title-debug": "Debuggen",
         "title-disable-transformation": "Transformation deaktivieren",
         "title-filter": "Filter",
@@ -5163,10 +5228,14 @@
       "show-images": "Bilder anzeigen",
       "title-add-another-transformation": "Weitere Transformation hinzufügen"
     },
+    "un-theme-transformations-editor": {
+      "body-delete-all-transformations": ""
+    },
     "un-themed-transformations-editor": {
       "actions": {
         "add-another-transformation": "Weitere Transformation hinzufügen"
       },
+      "confirmText-delete-all": "",
       "delete-all-transformations": "Alle Transformationen löschen",
       "title-delete-all-transformations": "Alle Transformationen löschen?",
       "tooltip-clear-search": "Suche löschen",
@@ -5203,6 +5272,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "Auswahl der Version {{version}} umschalten",
       "date": "Datum",
+      "name-latest": "",
       "notes": "Anmerkungen",
       "restore": "Wiederherstellen",
       "updated-by": "Aktualisiert von",
@@ -5279,7 +5349,8 @@
       "description-enables-users-custom-values": "Ermöglicht Nutzern, individuelle Werte zur Liste hinzuzufügen",
       "description-provide-dimensions-as-csv-dimension-name-dimension-id": "Dimensionen als CSV angeben: {{name}}, {{value}}",
       "label-data-source": "Datenquelle",
-      "label-use-static-key-dimensions": "Statische Key-Dimensionen verwenden"
+      "label-use-static-key-dimensions": "Statische Key-Dimensionen verwenden",
+      "name-allow-custom-values": ""
     },
     "add-to-dashboard": {
       "message": {
@@ -5352,6 +5423,9 @@
       }
     },
     "config-public-dashboard": {
+      "confirmText": {
+        "revoke-public-url": ""
+      },
       "title": {
         "revoke-public-url": "Öffentliche URL widerrufen"
       }
@@ -5363,6 +5437,7 @@
     },
     "custom-variable-form": {
       "custom-options": "Benutzerdefinierte Optionen",
+      "name-values-separated-comma": "",
       "selection-options": "Auswahloptionen"
     },
     "dashboard-edit-pane-renderer": {
@@ -5381,6 +5456,12 @@
       "label-type": "Typ",
       "label-url": "URL",
       "label-with-tags": "Mit Tags",
+      "link-type-options": {
+        "label": {
+          "dashboards": "",
+          "link": ""
+        }
+      },
       "placeholder-open-dashboard": "Dashboard öffnen"
     },
     "dashboard-link-list": {
@@ -5427,6 +5508,8 @@
       "data-source-options": "Datenquellenoptionen",
       "description-instance-name-filter": "Regex-Filter, für den Datenquelleninstanzen aus der Liste der Variablenwerte ausgewählt werden sollen. Für alle leer lassen.",
       "example-instance-name-filter": "Beispiel: <codeExample />",
+      "name-instance-name-filter": "",
+      "name-type": "",
       "selection-options": "Auswahloptionen"
     },
     "default-grid-layout-manager": {
@@ -5472,6 +5555,21 @@
     "empty-transformations-message": {
       "add-transformation": "Transformation hinzufügen"
     },
+    "general-settings-edit-view": {
+      "editable_options": {
+        "label": {
+          "editable": "",
+          "readonly": ""
+        }
+      },
+      "graph_tooltip_options": {
+        "label": {
+          "default": "",
+          "shared-crosshair": "",
+          "shared-tooltip": ""
+        }
+      }
+    },
     "get-edit-options": {
       "title": {
         "column-options": "Spaltenoptionen",
@@ -5502,7 +5600,8 @@
       "description-provide-dimensions-as-csv-dimension-name-dimension-id": "Dimensionen als CSV angeben: {{name}}, {{value}}",
       "group-by-options": "Nach Optionen gruppieren",
       "label-data-source": "Datenquelle",
-      "label-use-static-group-by-dimensions": "Statische Gruppen-Dimensionen verwenden"
+      "label-use-static-group-by-dimensions": "Statische Gruppen-Dimensionen verwenden",
+      "name-allow-custom-values": ""
     },
     "help-wizard": {
       "copy-to-clipboard": "In die Zwischenablage kopieren",
@@ -5538,9 +5637,14 @@
       "apply": "Anwenden"
     },
     "interval-variable-form": {
+      "description-auto-option": "",
       "description-calculated-value-below-threshold": "Der berechnete Wert wird diesen Schwellenwert nicht unterschreiten",
       "description-step-count": "Wie oft der aktuelle Zeitbereich zur Berechnung des Werts geteilt werden soll",
-      "interval-options": "Intervalloptionen"
+      "interval-options": "Intervalloptionen",
+      "name-auto-option": "",
+      "name-min-interval": "",
+      "name-step-count": "",
+      "name-values": ""
     },
     "json-model-edit-view": {
       "cancel-button": {
@@ -5565,6 +5669,9 @@
       "title-name-already-exists": "Der Name existiert bereits"
     },
     "on-open-snapshot-original-dashboard": {
+      "confirmText": {
+        "proceed": ""
+      },
       "title": {
         "proceed-to-external-site": "Weiter zu externer Seite?"
       }
@@ -5600,6 +5707,8 @@
     },
     "panel-data-transformations-tab-rendered": {
       "add-another-transformation": "Weitere Transformation hinzufügen",
+      "body-delete-all-transformations": "",
+      "confirmText-delete-all": "",
       "delete-all-transformations": "Alle Transformationen löschen",
       "title-delete-all-transformations": "Alle Transformationen löschen?"
     },
@@ -5653,6 +5762,7 @@
       "description-optional": "Optional, wenn Sie einen Teil eines Reihennamens oder eines metrischen Knotensegments extrahieren möchten.",
       "label-data-source": "Datenquelle",
       "label-target-data-source": "Zieldatenquelle",
+      "name-regex": "",
       "query-options": "Abfrageoptionen",
       "selection-options": "Auswahloptionen"
     },
@@ -5667,6 +5777,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "Sind Sie sicher, dass Sie das Dashboard auf die Version {{version}} zurücksetzen möchten? Alle nicht gespeicherten Änderungen gehen verloren.",
+      "confirmText-restore-version": "",
       "title-restore-version": "Version wiederherstellen"
     },
     "save-button": {
@@ -5760,7 +5871,11 @@
     "selection-options-form": {
       "description-enables-multiple-values-selected": "Ermöglicht die gleichzeitige Auswahl mehrerer Werte",
       "description-enables-option-include-variables": "Aktiviert eine Option, mit der alle Werte einbezogen werden",
-      "description-enables-users-custom-values": "Ermöglicht Nutzern, individuelle Werte zur Liste hinzuzufügen"
+      "description-enables-users-custom-values": "Ermöglicht Nutzern, individuelle Werte zur Liste hinzuzufügen",
+      "name-allow-custom-values": "",
+      "name-custom-all-value": "",
+      "name-include-all-option": "",
+      "name-multi-value": ""
     },
     "share-button": {
       "aria-label-sharedropdownmenu": "Freigabe-Menü umschalten"
@@ -5780,6 +5895,9 @@
         "copy-to-clipboard-failed": "Kopieren in die Zwischenablage fehlgeschlagen"
       }
     },
+    "text-box-variable": {
+      "name-default-value": ""
+    },
     "text-box-variable-form": {
       "placeholder-default-value-if-any": "(optional)",
       "text-options": "Textoptionen"
@@ -5803,6 +5921,8 @@
       }
     },
     "unlink-modal": {
+      "body-unlink-panel": "",
+      "confirmText-yes-unlink": "",
       "title-really-unlink-panel": "Möchten Sie die Verknüpfung dieses Panels wirklich aufheben?"
     },
     "unsaved-changes-modal": {
@@ -5819,6 +5939,9 @@
         }
       }
     },
+    "use-save-dashboard": {
+      "message-dashboard-saved": ""
+    },
     "variable-check-indicator": {
       "aria-label-variable-referenced-dashboard": "Diese Variable wird von keiner Variable bzw. keinem Dashboard referenziert.",
       "aria-label-variable-referenced-other-variables-dashboard": "Diese Variable wird von anderen Variablen oder Dashboards referenziert.",
@@ -5828,10 +5951,16 @@
     "variable-editor-form": {
       "aria-label-variable-editor-form": "Variablen-Editor-Formular",
       "back-to-list": "Zurück zur Liste",
+      "confirmText": {
+        "delete-variable": ""
+      },
       "delete": "Löschen",
       "description-optional-display-name": "Optionaler Anzeigename",
       "description-template-variable-characters": "Der Name der Vorlagenvariable. (Max. 50 Zeichen)",
       "general": "Allgemein",
+      "name-description": "",
+      "name-label": "",
+      "name-name": "",
       "placeholder-descriptive-text": "Beschreibender Text",
       "placeholder-label-name": "Label-Name",
       "placeholder-variable-name": "Variablenname",
@@ -5846,13 +5975,25 @@
       "variable": "Variable"
     },
     "variable-editor-list-row": {
+      "body-delete-variable": "",
+      "confirmText-delete-variable": "",
       "title-delete-variable": "Variable löschen",
       "tooltip-duplicate-variable": "Variable duplizieren",
       "tooltip-remove-variable": "Variable entfernen"
     },
     "variable-hide-select": {
+      "hide_options": {
+        "label": {
+          "label": "",
+          "nothing": "",
+          "variable": ""
+        }
+      },
       "label": "Ausblenden"
     },
+    "variable-type-select": {
+      "name-variable-type": ""
+    },
     "variable-usages-button": {
       "title-show-usages": "Nutzungen angezeigt für: {{variableId}}",
       "tooltip-show-usages": "Nutzungen anzeigen"
@@ -5879,6 +6020,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "Auswahl der Version {{version}} umschalten",
       "date": "Datum",
+      "name-latest": "",
       "notes": "Anmerkungen",
       "restore": "Wiederherstellen",
       "updated-by": "Aktualisiert von",
@@ -6266,7 +6408,8 @@
       }
     },
     "color-dimension-editor": {
-      "label-fixed-color": ""
+      "label-fixed-color": "",
+      "noOptionsMessage-no-fields-found": ""
     },
     "file-dropzone-custom-children": {
       "upload": "Hochladen"
@@ -6304,6 +6447,7 @@
       },
       "label-limit": "Limit",
       "label-value": "Wert",
+      "noOptionsMessage-no-fields-found": "",
       "scalar-options": {
         "description-clamped": "",
         "description-mod": "",
@@ -6312,9 +6456,15 @@
       }
     },
     "scale-dimension-editor": {
+      "fixed-value-option": {
+        "label": {
+          "fixed-value": ""
+        }
+      },
       "label-max": "Max.",
       "label-min": "Min.",
-      "label-value": "Wert"
+      "label-value": "Wert",
+      "noOptionsMessage-no-fields-found": ""
     },
     "text-dimension-editor": {
       "description-field": "",
@@ -6886,6 +7036,8 @@
       "aria-label-select-service-name-operator": "Dienstnamen-Operator auswählen",
       "aria-label-select-span-name": "Spannen-Name auswählen",
       "aria-label-select-span-name-operator": "Spannen-Namen-Operator auswählen",
+      "ariaLabel-select-max-span-duration": "",
+      "ariaLabel-select-min-span-duration": "",
       "label-collapse": "Spannenfilter",
       "label-duration": "Dauer",
       "label-service-name": "Dienstname",
@@ -6956,6 +7108,8 @@
       "split-widen": "Bereich verbreitern"
     },
     "trace-page-actions": {
+      "ariaLabel-copy-trace-id": "",
+      "ariaLabel-export-trace": "",
       "give-feedback": "Feedback geben",
       "label-copied": "Kopiert!",
       "label-export": "Exportieren",
@@ -7093,6 +7247,7 @@
   },
   "folder-filter": {
     "clear-folder-button": "Ordner löschen",
+    "noOptionsMessage-no-folders-found": "",
     "select-aria-label": "Ordnerfilter",
     "select-placeholder": "Nach Ordner filtern"
   },
@@ -7161,7 +7316,53 @@
     "incomplete-request-error": "Leider konnte ich Ihre Anfrage nicht abschließen. Bitte versuchen Sie es erneut.",
     "send-custom-feedback": "Senden"
   },
+  "geo": {
+    "get-geometry-field": {
+      "warning-gazetteer-not-found": "",
+      "warning-no-geometry": "",
+      "warning-select-geohash": "",
+      "warning-select-lat-long": "",
+      "warning-select-lookup": "",
+      "warning-unable-to-find": ""
+    },
+    "location-editor": {
+      "geohash-field": {
+        "no-fields-message": ""
+      },
+      "latitude-field": {
+        "no-fields-message": ""
+      },
+      "longitude-field": {
+        "no-fields-message": ""
+      },
+      "lookup-field": {
+        "no-fields-message": ""
+      },
+      "name-gazetteer": "",
+      "name-geohash-field": "",
+      "name-latitude-field": "",
+      "name-location-mode": "",
+      "name-longitude-field": "",
+      "name-lookup-field": ""
+    },
+    "location-more-editor": {
+      "mode-options": {
+        "description-auto": "",
+        "description-coords": "",
+        "description-geohash": "",
+        "description-lookup": "",
+        "label-auto": "",
+        "label-coords": "",
+        "label-geohash": "",
+        "label-lookup": ""
+      }
+    }
+  },
   "geomap": {
+    "category-basemap-layer": "",
+    "category-map-controls": "",
+    "category-map-layers": "",
+    "category-map-view": "",
     "coordinates-map-view-editor": {
       "label-latitude": "Breite",
       "label-longitude": "Länge"
@@ -7170,6 +7371,14 @@
       "center": "Mitte:",
       "zoom": "Zoom:"
     },
+    "description-initial-view": "",
+    "description-mouse-wheel-zoom": "",
+    "description-share-view": "",
+    "description-show-attribution": "",
+    "description-show-debug": "",
+    "description-show-measure": "",
+    "description-show-scale": "",
+    "description-show-zoom": "",
     "fit-map-view-editor": {
       "all-layers-editor-fragment": {
         "label-layer": "Layer"
@@ -7192,6 +7401,14 @@
     "geomap-style-rules-editor": {
       "aria-label-add-geomap-style-rule": "Geomap-Stilregel hinzufügen"
     },
+    "layer-editor": {
+      "category-base-layer": "",
+      "description-display-tooltip": "",
+      "name-data": "",
+      "name-display-tooltip": "",
+      "name-layer-type": "",
+      "name-opacity": ""
+    },
     "layers-editor": {
       "label-add-layer": "Layer hinzufügen",
       "no-layers": "Keine Layer?"
@@ -7202,16 +7419,38 @@
       "label-zoom": "Zoom",
       "use-current-map-settings": "Aktuelle Karteneinstellungen verwenden"
     },
+    "markers-layer": {
+      "description-show-legend": "",
+      "name-show-legend": "",
+      "name-styles": ""
+    },
     "markers-legend": {
       "title-symbol": "Symbol"
     },
     "measure-overlay": {
       "tooltip-show-measure-tools": "Messtools anzeigen"
     },
+    "name-initial-view": "",
+    "name-mouse-wheel-zoom": "",
+    "name-share-view": "",
+    "name-show-attribution": "",
+    "name-show-debug": "",
+    "name-show-measure": "",
+    "name-show-scale": "",
+    "name-show-zoom": "",
+    "name-tooltip": "",
+    "photos-layer": {
+      "noFieldsMessage-no-string-fields": ""
+    },
     "plugin": {
       "basemap-layer-configured-server-admin": "Der Basiskarten-Layer wird vom Serveradministrator konfiguriert."
     },
     "style-editor": {
+      "horizontal-align-options": {
+        "label-center": "",
+        "label-left": "",
+        "label-right": ""
+      },
       "label-align": "Ausrichten",
       "label-baseline": "Basislinie",
       "label-color": "Farbe",
@@ -7225,7 +7464,14 @@
       "label-symbol-vertical-align": "Symbol vertikal ausrichten",
       "label-text-label": "Text-Label",
       "label-x-offset": "X-Versatz",
-      "label-y-offset": "Y-Versatz"
+      "label-y-offset": "Y-Versatz",
+      "placeholderText-select-symbol": "",
+      "placeholderText-select-symbol-or-add-text": "",
+      "vertical-align-options": {
+        "label-bottom": "",
+        "label-center": "",
+        "label-top": ""
+      }
     },
     "style-rule-editor": {
       "aria-label-comparison-operator": "Vergleichsoperator",
@@ -7236,6 +7482,15 @@
       "placeholder-feature-property": "Funktionseigenschaft",
       "placeholder-numeric-value": "Numerischer Wert",
       "placeholder-value": "Wert"
+    },
+    "tooltip-options": {
+      "description-details": "",
+      "description-none": "",
+      "label-details": "",
+      "label-none": ""
+    },
+    "utils": {
+      "get-next-layer-name": ""
     }
   },
   "get-enterprise": {
@@ -7485,7 +7740,8 @@
       "aria-label-selected-color": "{{colorLabel}} Farbe"
     },
     "confirm-button": {
-      "cancel": "Abbrechen"
+      "cancel": "Abbrechen",
+      "confirmText-delete": ""
     },
     "confirm-content": {
       "placeholder": "Geben Sie zur Bestätigung „{{confirmPromptText}}“ ein"
@@ -7667,6 +7923,8 @@
     },
     "panel-chrome": {
       "aria-label-toggle-collapse": "Einklappen des Panels einschalten",
+      "ariaLabel-panel-loading": "",
+      "ariaLabel-panel-status": "",
       "tooltip-cancel": "Abfrage abbrechen",
       "tooltip-cancel-loading": "Abfrage abbrechen",
       "tooltip-stop-streaming": "Streaming anhalten",
@@ -7834,6 +8092,12 @@
       "footer-click-to-action": "Klicken, um zu {{actionTitle}}",
       "footer-click-to-navigate": "Zum Öffnen von {{linkTitle}} klicken",
       "timestamp": "Zeitstempel"
+    },
+    "week-start-picker": {
+      "weekStarts-label-default": "",
+      "weekStarts-label-monday": "",
+      "weekStarts-label-saturday": "",
+      "weekStarts-label-sunday": ""
     }
   },
   "graph": {
@@ -8212,6 +8476,10 @@
     "add-library-panel-modal": {
       "title-create-library-panel": "Bibliotheksleiste erstellen"
     },
+    "change-library-panel-modal": {
+      "confirmText-change": "",
+      "confirmText-replace": ""
+    },
     "confirm": {
       "delete-panel": "Möchten Sie dieses Panel löschen?"
     },
@@ -8656,6 +8924,8 @@
       "updated-on": "Aktualisiert am"
     },
     "snapshot-list-table": {
+      "body-delete": "",
+      "confirmText-delete": "",
       "title-delete": "Löschen"
     },
     "unthemed-dashboard-import": {
@@ -8667,6 +8937,9 @@
       }
     }
   },
+  "metric-select": {
+    "noOptionsMessage-no-options-found": ""
+  },
   "migrate-to-cloud": {
     "build-snapshot": {
       "description": "Dieses Tool kann Ressourcen von dieser Installation zu Ihrem Cloud-Stack migrieren. Erstellen Sie einen Snapshot dieser Installation, um zu beginnen. Das Erstellen eines Snapshots dauert in der Regel weniger als zwei Minuten. Der Snapshot wird neben dieser Grafana-Installation gespeichert.",
@@ -9376,7 +9649,7 @@
       "aria-label-nodes-hidden-warning": "Warnung bei ausgeblendeten Knoten",
       "computing-layout": "Layout berechnen",
       "no-data": "Keine Daten",
-      "hidden-nodes_one": "<0></0> {{count}} Knoten ist aus Leistungsgründen ausgeblendet.",
+      "hidden-nodes_one": "<0></0> {{count}} Knoten sind aus Leistungsgründen ausgeblendet.",
       "hidden-nodes_other": "<0></0> {{count}} Knoten sind aus Leistungsgründen ausgeblendet.",
       "processed-nodes_one": "<0></0> Das geschichtete Layout kann mit {{count}} Knoten langsam sein.",
       "processed-nodes_other": "<0></0> Das geschichtete Layout kann mit {{count}} Knoten langsam sein."
@@ -9505,6 +9778,7 @@
     }
   },
   "org-picker": {
+    "noOptionsMessage-no-organizations-found": "",
     "select-placeholder": "Organisation auswählen"
   },
   "page": {
@@ -9727,6 +10001,7 @@
         "permission": "Sie haben keine Berechtigung, diese Seite anzuzeigen.",
         "title-access-denied": "Zugriff verweigert"
       },
+      "error-loading-plugin": "",
       "no-root-app-page-component-found": "Keine Root-App-Seitenkomponente gefunden"
     },
     "browse": {
@@ -9770,8 +10045,7 @@
         "update-status-text": "Plugins aktualisiert"
       },
       "versions": {
-        "confirmation-text-1": "Möchten Sie wirklich auf die Version folgende herabstufen:",
-        "confirmation-text-2": "Normalerweise sollten Sie das nicht tun",
+        "confirmation-text": "",
         "downgrade-confirm": "Herabstufen",
         "downgrade-title": "Plugin-Version herabstufen"
       }
@@ -9825,6 +10099,10 @@
     "empty-state": {
       "message": "Keine Plugins gefunden"
     },
+    "extensions": {
+      "extension-error-alert-description": "",
+      "extension-error-alert-title": ""
+    },
     "extensions-log-data-source": {
       "message": {
         "ok": "OK"
@@ -9858,7 +10136,11 @@
       "updating": "Wird aktualisiert"
     },
     "install-controls-button": {
-      "title-uninstall-modal": "Deinstallieren von {{plugin}}"
+      "title-uninstall-modal": "Deinstallieren von {{plugin}}",
+      "uninstall-controls": {
+        "body-uninstall-plugin": "",
+        "confirmText-confirm": ""
+      }
     },
     "install-controls-warning": {
       "body-not-published": "Dieses Plugin wird nicht bei <2>grafana.com/plugins</2> veröffentlicht und kann nicht über den Katalog verwaltet werden.",
@@ -10894,6 +11176,7 @@
     }
   },
   "service-account-picker": {
+    "noOptionsMessage-no-service-accounts-found": "",
     "select-aria-label": "Dienstkontoauswahl",
     "select-placeholder": "Tippen Sie, um nach Dienstkonten zu suchen"
   },
@@ -10939,6 +11222,10 @@
     },
     "service-account-page-unconnected": {
       "add-service-account-token": "Dienstkonto-Token hinzufügen",
+      "body-delete-service-account": "",
+      "body-disable-service-account": "",
+      "confirmText-delete-service-account": "",
+      "confirmText-disable-service-account": "",
       "delete-service-account": "Dienstkonto löschen",
       "disable-service-account": "Dienstkonto deaktivieren",
       "enable-service-account": "Dienstkonto aktivieren",
@@ -10965,6 +11252,7 @@
       "used-by": "Genutzt von"
     },
     "service-account-profile-row": {
+      "confirmText-save": "",
       "edit": "Bearbeiten"
     },
     "service-account-role-row": {
@@ -10978,10 +11266,16 @@
     },
     "service-accounts-list-page-unconnected": {
       "add-service-account": "Dienstkonto hinzufügen",
+      "body-delete-with-tokens": "",
+      "body-disable-service-account": "",
+      "confirmText-delete": "",
+      "confirmText-disable-service-account": "",
       "placeholder-search-service-account-by-name": "Dienstkonto nach Namen suchen",
       "sub-title": "Dienstkonten und ihre Token können für die Authentifizierung gegenüber der Grafana-API verwendet werden. Erfahren Sie mehr in unserer <2>Dokumentation.</2>",
       "title-delete-service-account": "Dienstkonto löschen",
-      "title-disable-service-account": "Dienstkonto deaktivieren"
+      "title-disable-service-account": "Dienstkonto deaktivieren",
+      "body-delete_one": "",
+      "body-delete_other": ""
     },
     "token-expiration": {
       "content-this-token-has-expired": "Dieser Token ist abgelaufen",
@@ -11373,7 +11667,7 @@
       "label-never": ""
     },
     "status-history-panel": {
-      "too-many-points_one": "Zu viele Punkte, um sie richtig darzustellen. <1></1>Aktualisieren Sie die Abfrage, damit weniger Punkte zurückgegeben werden. <3></3>({{count}} Punkt erhalten)",
+      "too-many-points_one": "Zu viele Punkte, um sie richtig darzustellen. <1></1>Aktualisieren Sie die Abfrage, damit weniger Punkte zurückgegeben werden. <3></3>({{count}} Punkte erhalten)",
       "too-many-points_other": "Zu viele Punkte, um sie richtig darzustellen. <1></1>Aktualisieren Sie die Abfrage, damit weniger Punkte zurückgegeben werden. <3></3>({{count}} Punkte erhalten)"
     }
   },
@@ -11518,6 +11812,7 @@
     "tag-option-label": "Tag-Option"
   },
   "team-picker": {
+    "noOptionsMessage-no-teams-found": "",
     "select-aria-label": "Team-Picker",
     "select-placeholder": "Wählen Sie ein Team"
   },
@@ -11843,6 +12138,7 @@
     "convert-field-type-transformer-editor": {
       "aria-label-add-a-convert-field-type-transformer": "Transformator für „Feldtyp konvertieren“ hinzufügen",
       "aria-label-remove-convert-field-type-transformer": "Transformator für „Feldtyp konvertieren“ entfernen",
+      "convert-field-type": "",
       "label": {
         "browser": "Browser",
         "utc": "UTC"
@@ -11885,6 +12181,11 @@
       "remove-enum-row-tooltip-delete": "Löschen"
     },
     "extract-fields-transformer-editor": {
+      "field-name-picker-settings": {
+        "placeholderText": {
+          "select-field": ""
+        }
+      },
       "label-delimiter": "Trennzeichen",
       "label-format": "Format",
       "label-keep-time": "Zeit beibehalten",
@@ -11898,6 +12199,14 @@
       "aria-label-threshold-color": "Schwellenwert-Farbe"
     },
     "field-lookup-transformer-editor": {
+      "field-name-picker-settings": {
+        "noFieldsMessage": {
+          "no-text-fields-found": ""
+        },
+        "placeholderText": {
+          "select-text-field": ""
+        }
+      },
       "label-field": "Feld",
       "label-lookup": "Suche"
     },
@@ -11923,10 +12232,30 @@
     },
     "filter-by-value-transformer-editor": {
       "add-condition": "Bedingung hinzufügen",
+      "filter-match": {
+        "label": {
+          "match-all": "",
+          "match-any": ""
+        }
+      },
+      "filter-types": {
+        "label": {
+          "exclude": "",
+          "include": ""
+        }
+      },
       "label-conditions": "Bedingungen",
       "label-filter-type": "Filtertyp"
     },
     "format-string-transfomer-editor": {
+      "field-name-picker-settings": {
+        "noFieldsMessage": {
+          "no-text-fields-found": ""
+        },
+        "placeholderText": {
+          "select-text-field": ""
+        }
+      },
       "label-field": "Feld",
       "label-format": "Format",
       "label-substring-range": "Teilstring-Bereich"
@@ -12237,6 +12566,7 @@
     "title": "Organisationen"
   },
   "user-picker": {
+    "noOptionsMessage-no-users-found": "",
     "select-aria-label": "Nutzerauswahl",
     "select-placeholder": "Tippen Sie, um nach einem Nutzer zu suchen"
   },
@@ -12322,6 +12652,8 @@
       }
     },
     "confirm-delete-modal": {
+      "body-delete-variable": "",
+      "confirmText-delete": "",
       "title-delete-variable": "Variable löschen"
     },
     "create-ad-hoc-variable-adapter": {
@@ -12370,9 +12702,24 @@
       "label-refresh": "Aktualisieren"
     },
     "query-variable-sort-select": {
-      "description-values-variable": "Wie die Werte dieser Variable sortiert werden"
+      "description-values-variable": "Wie die Werte dieser Variable sortiert werden",
+      "name-sort": "",
+      "sort_options": {
+        "label": {
+          "alphabetical-asc": "",
+          "alphabetical-caseinsensitive-asc": "",
+          "alphabetical-caseinsensitive-desc": "",
+          "alphabetical-desc": "",
+          "disabled": "",
+          "natural-asc": "",
+          "natural-desc": "",
+          "numerical-asc": "",
+          "numerical-desc": ""
+        }
+      }
     },
     "text-box-variable-editor": {
+      "name-default-value": "",
       "placeholder-default-value-if-any": "Standardwert, falls vorhanden",
       "text-options": "Textoptionen"
     },
@@ -12401,6 +12748,8 @@
       "description-optional-display-name": "Optionaler Anzeigename",
       "description-template-variable-characters": "Der Name der Vorlagenvariable. (Max. 50 Zeichen)",
       "general": "Allgemein",
+      "name-label": "",
+      "name-name": "",
       "placeholder-descriptive-text": "Beschreibender Text",
       "placeholder-label-name": "Label-Name",
       "placeholder-variable-name": "Variablenname",
@@ -12415,9 +12764,15 @@
       "tooltip-duplicate-variable": "Variable duplizieren",
       "tooltip-remove-variable": "Variable entfernen"
     },
+    "variable-editor-un-connected": {
+      "name-description": ""
+    },
     "variable-options": {
       "aria-label-toggle-all-values": "Zwischen allen Werten schalten"
     },
+    "variable-type-select": {
+      "name-select-variable-type": ""
+    },
     "variable-usages-button": {
       "tooltip-show-usages": "Nutzungen anzeigen"
     },
diff --git a/public/locales/es-ES/grafana.json b/public/locales/es-ES/grafana.json
index cd899910ad3..be14e14cfee 100644
--- a/public/locales/es-ES/grafana.json
+++ b/public/locales/es-ES/grafana.json
@@ -84,6 +84,7 @@
     "admin-feature-toggles-table": {
       "confirm-modal-body-1": "Algunas características son estables (GA) y están habilitadas de forma predeterminada, mientras que otras se encuentran actualmente en su fase beta preliminar, disponibles para su adopción temprana.",
       "confirm-modal-body-2": "Aconsejamos comprender las implicaciones de cada cambio de característica antes de realizar modificaciones.",
+      "confirmText-save-changes": "",
       "get-stage-cell": {
         "beta": "Beta",
         "content-general-availability": "Disponibilidad general",
@@ -96,14 +97,21 @@
     },
     "admin-orgs-table": {
       "aria-label-delete-org": "Eliminar organización",
+      "confirmText-delete": "",
       "title-delete": "Eliminar"
     },
     "anon-users": {
       "not-found": "No se han encontrado usuarios anónimos."
     },
     "base-user-sessions": {
+      "body-force-logout-from-all-devices": "",
+      "confirmText-confirm-logout": "",
+      "confirmText-force-logout": "",
       "title-force-logout-from-all-devices": "Forzar cierre de sesión en todos los dispositivos"
     },
+    "change-org-button": {
+      "confirmText-save": ""
+    },
     "edit-org": {
       "access-denied": "No tienes permiso para ver a los usuarios de esta organización. Para actualizar esta organización, ponte en contacto con el administrador del servidor.",
       "heading": "Editar organización",
@@ -208,9 +216,11 @@
       "not-editable": "La función de este usuario no puede editarse porque está sincronizada con tu proveedor de autenticación. Consulta los <1>documentos de autenticación de Grafana</1> para obtener más información."
     },
     "org-users-table": {
+      "body-delete": "",
       "columns": {
         "aria-label-role": "Rol"
       },
+      "confirmText-delete": "",
       "delete-aria-label": "Eliminar usuario: {{name}}",
       "title-delete": "Eliminar"
     },
@@ -241,6 +251,9 @@
     "settings": {
       "info-description": "Estos ajustes del sistema están definidos en grafana.ini o custom.ini (o anulados en variables ENV). Para modificarlos, actualmente es necesario reiniciar Grafana."
     },
+    "un-themed-org-row": {
+      "confirmText-confirm-removal": ""
+    },
     "upgrade-info": {
       "title": "Licencia Enterprise"
     },
@@ -293,12 +306,17 @@
     },
     "user-permissions": {
       "change-button": "Cambiar",
+      "confirmText-change": "",
       "grafana-admin-key": "Administrador de Grafana",
       "grafana-admin-no": "No",
       "grafana-admin-yes": "Sí",
       "title": "Permisos"
     },
     "user-profile": {
+      "body-delete": "",
+      "body-disable": "",
+      "confirmText-delete-user": "",
+      "confirmText-disable-user": "",
       "delete-button": "Eliminar usuario",
       "disable-button": "Deshabilitar usuario",
       "edit-button": "Editar",
@@ -312,6 +330,9 @@
       "title-delete-user": "Eliminar usuario",
       "title-disable-user": "Deshabilitar usuario"
     },
+    "user-profile-row": {
+      "confirmText-save": ""
+    },
     "user-sessions": {
       "browser-column": "Navegador y sistema operativo",
       "force-logout-all-button": "Forzar cierre de sesión en todos los dispositivos",
@@ -461,6 +482,9 @@
       "label-muting-grouping-and-timings-optional": "Silencio, agrupación y temporización (opcional)",
       "title-muting-grouping-and-timings": "Silencio, agrupación y temporización"
     },
+    "alert-manager-picker": {
+      "noOptionsMessage-no-datasources-found": ""
+    },
     "alert-menu": {
       "copy-link": "Copiar enlace",
       "duplicate": "Duplicar",
@@ -550,6 +574,7 @@
       "view-configuration": "Ver configuración"
     },
     "alertmanager-config": {
+      "confirmText-yes-reset-configuration": "",
       "gma-manual-configuration-description": "La configuración interna de Grafana Alertmanager no se puede cambiar manualmente. Para cambiar esta configuración, edita los recursos individuales a través de la interfaz de usuario.",
       "gma-manual-configuration-is-not-supported": "No se admiten cambios de configuración manual",
       "message": {
@@ -564,11 +589,13 @@
       "title-resetting-alertmanager-configuration": "Restableciendo la configuración de Alertmanager"
     },
     "alertmanager-configuration-version-manager": {
+      "body-restore-configuration-version-unsaved-changes": "",
       "columns": {
         "compare": "Comparar",
         "restore": "Restaurar",
         "text-latest": "Recientes"
       },
+      "confirmText-yes-restore-configuration": "",
       "loading": "Cargando...",
       "no-previous-configurations": "No hay configuraciones anteriores",
       "this-might-take-a-while": "Este proceso puede llevar un tiempo...",
@@ -848,8 +875,10 @@
     },
     "contact-point-header": {
       "aria-label-more-actions": "Más acciones para el punto de contacto «{{contactPointName}}»",
+      "ariaLabel-delete": "",
       "button-edit": "Editar",
       "button-view": "Vista",
+      "export-ariaLabel-export": "",
       "export-label-export": "Exportar",
       "label-delete": "Eliminar",
       "label-manage-permissions": "Gestionar permisos",
@@ -1384,6 +1413,7 @@
       "label-disable-resolved-message": "Deshabilitar mensaje resuelto"
     },
     "grafana-evaluation-behavior-step": {
+      "loadingMessage-loading-groups": "",
       "message": {
         "must-be-a-positive-integer": "El valor debe ser un número entero positivo.",
         "must-enter-a-group-name": "Debe introducirse un nombre del grupo"
@@ -1842,7 +1872,11 @@
             "other-data-sources": "Otras fuentes de datos"
           }
         }
-      }
+      },
+      "noOptionsMessage-no-datasources-found": ""
+    },
+    "mute-timing-actions-button": {
+      "body-delete-mute-timing": ""
     },
     "mute-timing-actions-buttons": {
       "text-disabled": "Desactivado",
@@ -2093,9 +2127,11 @@
       "update-errors": {
         "conflict": "Otro usuario ha actualizado el árbol de políticas de notificación.",
         "error-code": "Mensaje de error: «{{error}}»",
-        "fallback": "Se ha producido un error al actualizar tus políticas de notificación.",
+        "routes": {
+          "conflictingMatchers": ""
+        },
         "suffix": "Actualiza la página y vuelve a intentarlo.",
-        "title": "Error al guardar la política de notificación"
+        "title": ""
       },
       "n-more-policies_one": "{{count}} políticas adicionales",
       "n-more-policies_other": "{{count}} políticas adicionales"
@@ -2151,6 +2187,7 @@
     "query-and-expressions-step": {
       "add-query": "Añadir consulta",
       "body-queries-expressions-configured": "Crea al menos una consulta o expresión sobre la que alertar",
+      "confirmText-deactivate": "",
       "expressions": "Expresiones",
       "loading-data-sources": "Cargando fuentes de datos...",
       "manipulate-returned-queries-other-operations": "Manipula los datos devueltos por las consultas con operaciones matemáticas y de otro tipo.",
@@ -2218,6 +2255,7 @@
     "redirect-to-clone-rule": {
       "body-evaluation-group": "Deberás establecer un nuevo grupo de evaluación para la regla copiada porque el original se ha aprovisionado y no se puede usar para las reglas creadas en la interfaz de usuario.",
       "body-not-provisioned": "La nueva regla <1>no</1> se marcará como una regla aprovisionada.",
+      "confirmText-copy": "",
       "title-copy-provisioned-alert-rule": "Copiar regla de alerta aprovisionada"
     },
     "redirect-to-rule-viewer": {
@@ -2415,8 +2453,6 @@
       "title-inspect-alert-rule": "Inspeccionar regla de alerta"
     },
     "rule-list": {
-      "cannot-find-rule-details-for": "No se pueden encontrar los detalles de la regla para el UID {{uid}}",
-      "cannot-load-rule-details-for": "No se pueden cargar los detalles de la regla para el UID {{uid}}",
       "configure-datasource": "Configurar",
       "draft-new-rule": "Redactar una nueva regla",
       "ds-error": {
@@ -2766,6 +2802,9 @@
       "existing-templates-selector-placeholder-choose-notification-template": "Elegir plantilla de notificación",
       "loading": "Cargando...",
       "template-options": {
+        "ariaLabel": {
+          "select-notification-template": ""
+        },
         "label": {
           "select-notification-template": "Seleccionar plantilla de notificación"
         }
@@ -2792,6 +2831,8 @@
     },
     "templates-table": {
       "actions": "Acciones",
+      "body-delete-template-group": "",
+      "confirmText-yes-delete": "",
       "no-templates-defined": "No hay plantillas definidas.",
       "template-group": "Grupo de plantillas",
       "title-delete-template-group": "Eliminar grupo de plantillas"
@@ -2919,6 +2960,11 @@
         "title-delete-contact-point": "Eliminar punto de contacto"
       }
     },
+    "use-delete-modal": {
+      "modal": {
+        "confirmText-yes-delete": ""
+      }
+    },
     "use-delete-policy-modal": {
       "modal-element": {
         "title-delete-notification-policy": "Eliminar política de notificación"
@@ -3075,7 +3121,8 @@
     "annotation-field-mapper": {
       "annotation": "Notas",
       "first-value": "Primer valor",
-      "from": ""
+      "from": "",
+      "noOptionsMessage-unknown-field-names": ""
     },
     "empty-state": {
       "button-title": "Añadir consulta de anotación",
@@ -3209,7 +3256,7 @@
       "team-ids-github": "Lista de números enteros de ID de equipo.",
       "team-ids-label": "ID de equipo",
       "team-ids-numbers": "Los ID de equipo deben ser números.",
-      "team-ids-other": "Lista de cadenas de identificadores de equipo.",
+      "team-ids-other": "",
       "team-ids-placeholder": "Introduzca los ID de equipo y pulse Intro para añadirlos",
       "teams-url-description": "La URL utilizada para consultar los ID de equipo. Si no se establece, el valor predeterminado es /teams.",
       "teams-url-description-oauth": "Si configura «{{ teamsURLLabel }}», también debe configurar «{{ teamIDsAttributePathLabel }}».",
@@ -3253,6 +3300,7 @@
       "additional-actions-menu": {
         "label-reset-to-default-values": "Restablecer a los valores predeterminados"
       },
+      "confirmText-reset": "",
       "disable": "Deshabilitar",
       "disabling": "Deshabilitando...",
       "discard": "Descartar",
@@ -4180,8 +4228,8 @@
     }
   },
   "dashbaord-scene": {
-    "interval-variable-form": {
-      "description-auto-option": "Calcula dinámicamente el intervalo dividiendo el intervalo de tiempo por el recuento especificado"
+    "variable-editor-form": {
+      "run-query": ""
     }
   },
   "dashboard": {
@@ -4343,6 +4391,9 @@
     },
     "dash-nav": {
       "on-open-snapshot-original": {
+        "confirmText": {
+          "proceed": ""
+        },
         "title": {
           "proceed-to-external-site": "¿Dirigirse a un sitio externo?"
         }
@@ -4557,6 +4608,13 @@
           "editable": "Editable",
           "readonly": "Solo lectura"
         }
+      },
+      "graph_tooltip_options": {
+        "label": {
+          "default": "",
+          "shared-crosshair": "",
+          "shared-tooltip": ""
+        }
       }
     },
     "get-debug-dashboard": {
@@ -4861,6 +4919,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "¿Seguro que quieres restaurar el dashboard a la versión {{version}}? Todos los cambios no guardados se perderán.",
+      "confirmText-restore-version": "",
       "title-restore-version": "Restaurar versión"
     },
     "row-options-button": {
@@ -4911,6 +4970,9 @@
         "title-not-unique": "Este título no es único"
       }
     },
+    "save-dashboard": {
+      "message-dashboard-saved": ""
+    },
     "save-dashboard-as-button": {
       "save-as": "Guardar como"
     },
@@ -4945,6 +5007,7 @@
     "save-dashboard-error-proxy": {
       "body-name-exists": "Ya existe un dashboard con el mismo nombre en la carpeta seleccionada.<1></1><2>¿Seguro que quieres guardar este dashboard?</2>",
       "body-version-mismatch": "Otra persona ha actualizado este dashboard<1></1><2>¿Seguro que quieres guardar este dashboard?</2>",
+      "confirmText-save-and-overwrite": "",
       "title-name-exists": "Conflicto",
       "title-version-mismatch": "Conflicto"
     },
@@ -5141,7 +5204,9 @@
       "label-apply-transformation-to": "Aplicar transformación a"
     },
     "transformation-operation-row": {
+      "body-delete": "",
       "render-actions": {
+        "confirmText-delete": "",
         "title-debug": "Depuración",
         "title-disable-transformation": "Deshabilitar transformación",
         "title-filter": "Filtro",
@@ -5163,10 +5228,14 @@
       "show-images": "Mostrar imágenes",
       "title-add-another-transformation": "Añadir otra transformación"
     },
+    "un-theme-transformations-editor": {
+      "body-delete-all-transformations": ""
+    },
     "un-themed-transformations-editor": {
       "actions": {
         "add-another-transformation": "Añadir otra transformación"
       },
+      "confirmText-delete-all": "",
       "delete-all-transformations": "Eliminar todas las transformaciones",
       "title-delete-all-transformations": "¿Eliminar todas las transformaciones?",
       "tooltip-clear-search": "Borrar búsqueda",
@@ -5203,6 +5272,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "Alternar selección de versión {{version}}",
       "date": "Fecha",
+      "name-latest": "",
       "notes": "Notas",
       "restore": "Restaurar",
       "updated-by": "Actualizada por",
@@ -5279,7 +5349,8 @@
       "description-enables-users-custom-values": "Permite a los usuarios añadir valores personalizados a la lista",
       "description-provide-dimensions-as-csv-dimension-name-dimension-id": "Proporcionar dimensiones como CSV: {{name}}, {{value}}",
       "label-data-source": "Fuente de datos",
-      "label-use-static-key-dimensions": "Usar dimensiones de clave estática"
+      "label-use-static-key-dimensions": "Usar dimensiones de clave estática",
+      "name-allow-custom-values": ""
     },
     "add-to-dashboard": {
       "message": {
@@ -5352,6 +5423,9 @@
       }
     },
     "config-public-dashboard": {
+      "confirmText": {
+        "revoke-public-url": ""
+      },
       "title": {
         "revoke-public-url": "Revocar URL pública"
       }
@@ -5363,6 +5437,7 @@
     },
     "custom-variable-form": {
       "custom-options": "Opciones personalizadas",
+      "name-values-separated-comma": "",
       "selection-options": "Opciones de selección"
     },
     "dashboard-edit-pane-renderer": {
@@ -5381,6 +5456,12 @@
       "label-type": "Tipo",
       "label-url": "URL",
       "label-with-tags": "Con etiquetas",
+      "link-type-options": {
+        "label": {
+          "dashboards": "",
+          "link": ""
+        }
+      },
       "placeholder-open-dashboard": "Abrir panel"
     },
     "dashboard-link-list": {
@@ -5427,6 +5508,8 @@
       "data-source-options": "Opciones de fuente de datos",
       "description-instance-name-filter": "Filtro Regex para elegir las instancias de origen de datos en la lista de valores de variables. Déjalo vacío para todos.",
       "example-instance-name-filter": "Ejemplo: <codeExample />",
+      "name-instance-name-filter": "",
+      "name-type": "",
       "selection-options": "Opciones de selección"
     },
     "default-grid-layout-manager": {
@@ -5472,6 +5555,21 @@
     "empty-transformations-message": {
       "add-transformation": "Añadir transformación"
     },
+    "general-settings-edit-view": {
+      "editable_options": {
+        "label": {
+          "editable": "",
+          "readonly": ""
+        }
+      },
+      "graph_tooltip_options": {
+        "label": {
+          "default": "",
+          "shared-crosshair": "",
+          "shared-tooltip": ""
+        }
+      }
+    },
     "get-edit-options": {
       "title": {
         "column-options": "Opciones de columna",
@@ -5502,7 +5600,8 @@
       "description-provide-dimensions-as-csv-dimension-name-dimension-id": "Proporcionar dimensiones como CSV: {{name}}, {{value}}",
       "group-by-options": "Agrupar por opciones",
       "label-data-source": "Fuente de datos",
-      "label-use-static-group-by-dimensions": "Usar dimensiones de grupo estático"
+      "label-use-static-group-by-dimensions": "Usar dimensiones de grupo estático",
+      "name-allow-custom-values": ""
     },
     "help-wizard": {
       "copy-to-clipboard": "Copiar al portapapeles",
@@ -5538,9 +5637,14 @@
       "apply": "Aplicar"
     },
     "interval-variable-form": {
+      "description-auto-option": "",
       "description-calculated-value-below-threshold": "El valor calculado no será inferior a este umbral",
       "description-step-count": "Cuántas veces se debe dividir el rango de tiempo actual para calcular el valor",
-      "interval-options": "Opciones de intervalo"
+      "interval-options": "Opciones de intervalo",
+      "name-auto-option": "",
+      "name-min-interval": "",
+      "name-step-count": "",
+      "name-values": ""
     },
     "json-model-edit-view": {
       "cancel-button": {
@@ -5565,6 +5669,9 @@
       "title-name-already-exists": "Este nombre ya existe"
     },
     "on-open-snapshot-original-dashboard": {
+      "confirmText": {
+        "proceed": ""
+      },
       "title": {
         "proceed-to-external-site": "¿Dirigirse a un sitio externo?"
       }
@@ -5600,6 +5707,8 @@
     },
     "panel-data-transformations-tab-rendered": {
       "add-another-transformation": "Añadir otra transformación",
+      "body-delete-all-transformations": "",
+      "confirmText-delete-all": "",
       "delete-all-transformations": "Eliminar todas las transformaciones",
       "title-delete-all-transformations": "¿Eliminar todas las transformaciones?"
     },
@@ -5653,6 +5762,7 @@
       "description-optional": "Es opcional si quieres extraer parte del nombre de una serie o segmento de nodo métrico.",
       "label-data-source": "Fuente de datos",
       "label-target-data-source": "Fuente de datos de destino",
+      "name-regex": "",
       "query-options": "Opciones de consulta",
       "selection-options": "Opciones de selección"
     },
@@ -5667,6 +5777,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "¿Seguro que quieres restaurar el dashboard a la versión {{version}}? Todos los cambios no guardados se perderán.",
+      "confirmText-restore-version": "",
       "title-restore-version": "Restaurar versión"
     },
     "save-button": {
@@ -5760,7 +5871,11 @@
     "selection-options-form": {
       "description-enables-multiple-values-selected": "Permite seleccionar varios valores al mismo tiempo",
       "description-enables-option-include-variables": "Habilita una opción para incluir todos los valores",
-      "description-enables-users-custom-values": "Permite a los usuarios añadir valores personalizados a la lista"
+      "description-enables-users-custom-values": "Permite a los usuarios añadir valores personalizados a la lista",
+      "name-allow-custom-values": "",
+      "name-custom-all-value": "",
+      "name-include-all-option": "",
+      "name-multi-value": ""
     },
     "share-button": {
       "aria-label-sharedropdownmenu": "Alternar menú de compartir"
@@ -5780,6 +5895,9 @@
         "copy-to-clipboard-failed": "Error al copiar al portapapeles"
       }
     },
+    "text-box-variable": {
+      "name-default-value": ""
+    },
     "text-box-variable-form": {
       "placeholder-default-value-if-any": "(opcional)",
       "text-options": "Opciones de texto"
@@ -5803,6 +5921,8 @@
       }
     },
     "unlink-modal": {
+      "body-unlink-panel": "",
+      "confirmText-yes-unlink": "",
       "title-really-unlink-panel": "¿Seguro que quieres desvincular este panel?"
     },
     "unsaved-changes-modal": {
@@ -5819,6 +5939,9 @@
         }
       }
     },
+    "use-save-dashboard": {
+      "message-dashboard-saved": ""
+    },
     "variable-check-indicator": {
       "aria-label-variable-referenced-dashboard": "Esta variable no está referenciada por ninguna variable o dashboard.",
       "aria-label-variable-referenced-other-variables-dashboard": "Esta variable está referenciada por otras variables o dashboards.",
@@ -5828,10 +5951,16 @@
     "variable-editor-form": {
       "aria-label-variable-editor-form": "Formulario del editor de variables",
       "back-to-list": "Regresar a la lista",
+      "confirmText": {
+        "delete-variable": ""
+      },
       "delete": "Eliminar",
       "description-optional-display-name": "Nombre para mostrar opcional",
       "description-template-variable-characters": "El nombre de la variable de la plantilla. (Máx. 50 caracteres)",
       "general": "General",
+      "name-description": "",
+      "name-label": "",
+      "name-name": "",
       "placeholder-descriptive-text": "Texto descriptivo",
       "placeholder-label-name": "Nombre de la etiqueta",
       "placeholder-variable-name": "Nombre de la variable",
@@ -5846,13 +5975,25 @@
       "variable": "Variable"
     },
     "variable-editor-list-row": {
+      "body-delete-variable": "",
+      "confirmText-delete-variable": "",
       "title-delete-variable": "Eliminar variable",
       "tooltip-duplicate-variable": "Duplicar variable",
       "tooltip-remove-variable": "Quitar variable"
     },
     "variable-hide-select": {
+      "hide_options": {
+        "label": {
+          "label": "",
+          "nothing": "",
+          "variable": ""
+        }
+      },
       "label": "Ocultar"
     },
+    "variable-type-select": {
+      "name-variable-type": ""
+    },
     "variable-usages-button": {
       "title-show-usages": "Mostrando usos para: {{variableId}}",
       "tooltip-show-usages": "Mostrar usos"
@@ -5879,6 +6020,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "Alternar selección de versión {{version}}",
       "date": "Fecha",
+      "name-latest": "",
       "notes": "Notas",
       "restore": "Restaurar",
       "updated-by": "Actualizada por",
@@ -6266,7 +6408,8 @@
       }
     },
     "color-dimension-editor": {
-      "label-fixed-color": ""
+      "label-fixed-color": "",
+      "noOptionsMessage-no-fields-found": ""
     },
     "file-dropzone-custom-children": {
       "upload": "Subir"
@@ -6304,6 +6447,7 @@
       },
       "label-limit": "Límite",
       "label-value": "Valor",
+      "noOptionsMessage-no-fields-found": "",
       "scalar-options": {
         "description-clamped": "",
         "description-mod": "",
@@ -6312,9 +6456,15 @@
       }
     },
     "scale-dimension-editor": {
+      "fixed-value-option": {
+        "label": {
+          "fixed-value": ""
+        }
+      },
       "label-max": "Máx.",
       "label-min": "Mín.",
-      "label-value": "Valor"
+      "label-value": "Valor",
+      "noOptionsMessage-no-fields-found": ""
     },
     "text-dimension-editor": {
       "description-field": "",
@@ -6886,6 +7036,8 @@
       "aria-label-select-service-name-operator": "Seleccionar operador de nombre de servicio",
       "aria-label-select-span-name": "Seleccionar nombre de intervalo",
       "aria-label-select-span-name-operator": "Seleccionar operador de nombre de intervalo",
+      "ariaLabel-select-max-span-duration": "",
+      "ariaLabel-select-min-span-duration": "",
       "label-collapse": "Filtros de intervalo",
       "label-duration": "Duración",
       "label-service-name": "Nombre de servicio",
@@ -6956,6 +7108,8 @@
       "split-widen": "Agrandar panel"
     },
     "trace-page-actions": {
+      "ariaLabel-copy-trace-id": "",
+      "ariaLabel-export-trace": "",
       "give-feedback": "Enviar comentarios",
       "label-copied": "¡Copiado!",
       "label-export": "Exportar",
@@ -7093,6 +7247,7 @@
   },
   "folder-filter": {
     "clear-folder-button": "Borrar carpetas",
+    "noOptionsMessage-no-folders-found": "",
     "select-aria-label": "Filtro de carpeta",
     "select-placeholder": "Filtrar por carpeta"
   },
@@ -7161,7 +7316,53 @@
     "incomplete-request-error": "Lo sentimos, no hemos podido completar tu solicitud. Vuelve a intentarlo.",
     "send-custom-feedback": "Enviar"
   },
+  "geo": {
+    "get-geometry-field": {
+      "warning-gazetteer-not-found": "",
+      "warning-no-geometry": "",
+      "warning-select-geohash": "",
+      "warning-select-lat-long": "",
+      "warning-select-lookup": "",
+      "warning-unable-to-find": ""
+    },
+    "location-editor": {
+      "geohash-field": {
+        "no-fields-message": ""
+      },
+      "latitude-field": {
+        "no-fields-message": ""
+      },
+      "longitude-field": {
+        "no-fields-message": ""
+      },
+      "lookup-field": {
+        "no-fields-message": ""
+      },
+      "name-gazetteer": "",
+      "name-geohash-field": "",
+      "name-latitude-field": "",
+      "name-location-mode": "",
+      "name-longitude-field": "",
+      "name-lookup-field": ""
+    },
+    "location-more-editor": {
+      "mode-options": {
+        "description-auto": "",
+        "description-coords": "",
+        "description-geohash": "",
+        "description-lookup": "",
+        "label-auto": "",
+        "label-coords": "",
+        "label-geohash": "",
+        "label-lookup": ""
+      }
+    }
+  },
   "geomap": {
+    "category-basemap-layer": "",
+    "category-map-controls": "",
+    "category-map-layers": "",
+    "category-map-view": "",
     "coordinates-map-view-editor": {
       "label-latitude": "Latitud",
       "label-longitude": "Longitud"
@@ -7170,6 +7371,14 @@
       "center": "Centro:",
       "zoom": "Escala:"
     },
+    "description-initial-view": "",
+    "description-mouse-wheel-zoom": "",
+    "description-share-view": "",
+    "description-show-attribution": "",
+    "description-show-debug": "",
+    "description-show-measure": "",
+    "description-show-scale": "",
+    "description-show-zoom": "",
     "fit-map-view-editor": {
       "all-layers-editor-fragment": {
         "label-layer": "Nivel"
@@ -7192,6 +7401,14 @@
     "geomap-style-rules-editor": {
       "aria-label-add-geomap-style-rule": "Añadir regla de estilo de geomapa"
     },
+    "layer-editor": {
+      "category-base-layer": "",
+      "description-display-tooltip": "",
+      "name-data": "",
+      "name-display-tooltip": "",
+      "name-layer-type": "",
+      "name-opacity": ""
+    },
     "layers-editor": {
       "label-add-layer": "Añadir capa",
       "no-layers": "¿No hay capas?"
@@ -7202,16 +7419,38 @@
       "label-zoom": "Ampliar",
       "use-current-map-settings": "Utilizar ajustes actuales de mapa"
     },
+    "markers-layer": {
+      "description-show-legend": "",
+      "name-show-legend": "",
+      "name-styles": ""
+    },
     "markers-legend": {
       "title-symbol": "Símbolo"
     },
     "measure-overlay": {
       "tooltip-show-measure-tools": "Mostrar herramientas de medición"
     },
+    "name-initial-view": "",
+    "name-mouse-wheel-zoom": "",
+    "name-share-view": "",
+    "name-show-attribution": "",
+    "name-show-debug": "",
+    "name-show-measure": "",
+    "name-show-scale": "",
+    "name-show-zoom": "",
+    "name-tooltip": "",
+    "photos-layer": {
+      "noFieldsMessage-no-string-fields": ""
+    },
     "plugin": {
       "basemap-layer-configured-server-admin": "La capa del mapa base está configurada por el administrador del servidor."
     },
     "style-editor": {
+      "horizontal-align-options": {
+        "label-center": "",
+        "label-left": "",
+        "label-right": ""
+      },
       "label-align": "Alinear",
       "label-baseline": "Punto de referencia",
       "label-color": "Color",
@@ -7225,7 +7464,14 @@
       "label-symbol-vertical-align": "Alineación vertical de símbolo",
       "label-text-label": "Etiqueta de texto",
       "label-x-offset": "Compensación X",
-      "label-y-offset": "Compensación Y"
+      "label-y-offset": "Compensación Y",
+      "placeholderText-select-symbol": "",
+      "placeholderText-select-symbol-or-add-text": "",
+      "vertical-align-options": {
+        "label-bottom": "",
+        "label-center": "",
+        "label-top": ""
+      }
     },
     "style-rule-editor": {
       "aria-label-comparison-operator": "Operador de comparación",
@@ -7236,6 +7482,15 @@
       "placeholder-feature-property": "Propiedad destacada",
       "placeholder-numeric-value": "Valor numérico",
       "placeholder-value": "valor"
+    },
+    "tooltip-options": {
+      "description-details": "",
+      "description-none": "",
+      "label-details": "",
+      "label-none": ""
+    },
+    "utils": {
+      "get-next-layer-name": ""
     }
   },
   "get-enterprise": {
@@ -7485,7 +7740,8 @@
       "aria-label-selected-color": "{{colorLabel}} color"
     },
     "confirm-button": {
-      "cancel": "Cancelar"
+      "cancel": "Cancelar",
+      "confirmText-delete": ""
     },
     "confirm-content": {
       "placeholder": "Escribe «{{confirmPromptText}}» para confirmar"
@@ -7667,6 +7923,8 @@
     },
     "panel-chrome": {
       "aria-label-toggle-collapse": "alternar panel para contraer",
+      "ariaLabel-panel-loading": "",
+      "ariaLabel-panel-status": "",
       "tooltip-cancel": "Cancelar consulta",
       "tooltip-cancel-loading": "Cancelar consulta",
       "tooltip-stop-streaming": "Detener transmisión",
@@ -7834,6 +8092,12 @@
       "footer-click-to-action": "Haz clic para {{actionTitle}}",
       "footer-click-to-navigate": "Haz clic para abrir {{linkTitle}}",
       "timestamp": "Marca de tiempo"
+    },
+    "week-start-picker": {
+      "weekStarts-label-default": "",
+      "weekStarts-label-monday": "",
+      "weekStarts-label-saturday": "",
+      "weekStarts-label-sunday": ""
     }
   },
   "graph": {
@@ -8212,6 +8476,10 @@
     "add-library-panel-modal": {
       "title-create-library-panel": "Crear panel de librería"
     },
+    "change-library-panel-modal": {
+      "confirmText-change": "",
+      "confirmText-replace": ""
+    },
     "confirm": {
       "delete-panel": "¿Quieres eliminar este panel?"
     },
@@ -8656,6 +8924,8 @@
       "updated-on": "Actualizado el"
     },
     "snapshot-list-table": {
+      "body-delete": "",
+      "confirmText-delete": "",
       "title-delete": "Eliminar"
     },
     "unthemed-dashboard-import": {
@@ -8667,6 +8937,9 @@
       }
     }
   },
+  "metric-select": {
+    "noOptionsMessage-no-options-found": ""
+  },
   "migrate-to-cloud": {
     "build-snapshot": {
       "description": "Esta herramienta puede migrar algunos recursos de esta instalación a tu pila en la nube. Para empezar, deberás crear una instantánea de esta instalación. La creación de una instantánea suele tardar menos de dos minutos. La instantánea se almacena junto con esta instalación de Grafana.",
@@ -9365,7 +9638,7 @@
     "marker": {
       "100-node-count": ">100 nodos",
       "aria-label-hidden-marker": "Marcador de nodos ocultos: {{marker}}",
-      "node-count_one": "{{count}} nodo",
+      "node-count_one": "{{count}} nodos",
       "node-count_other": "{{count}} nodos"
     },
     "node": {
@@ -9376,9 +9649,9 @@
       "aria-label-nodes-hidden-warning": "Advertencia de nodos ocultos",
       "computing-layout": "Calculando el diseño",
       "no-data": "Sin datos",
-      "hidden-nodes_one": "<0></0> {{count}} nodo está oculto por razones de rendimiento.",
+      "hidden-nodes_one": "<0></0> {{count}} nodos están ocultos por razones de rendimiento.",
       "hidden-nodes_other": "<0></0> {{count}} nodos están ocultos por razones de rendimiento.",
-      "processed-nodes_one": "<0></0> El diseño en capas puede ser lento con {{count}} nodo.",
+      "processed-nodes_one": "<0></0> El diseño en capas puede ser lento con {{count}} nodos.",
       "processed-nodes_other": "<0></0> El diseño en capas puede ser lento con {{count}} nodos."
     },
     "node-graph-panel": {
@@ -9505,6 +9778,7 @@
     }
   },
   "org-picker": {
+    "noOptionsMessage-no-organizations-found": "",
     "select-placeholder": "Seleccionar organización"
   },
   "page": {
@@ -9727,6 +10001,7 @@
         "permission": "No tienes permiso para ver esta página.",
         "title-access-denied": "Acceso denegado"
       },
+      "error-loading-plugin": "",
       "no-root-app-page-component-found": "No se ha encontrado ningún componente de página de la aplicación raíz"
     },
     "browse": {
@@ -9770,8 +10045,7 @@
         "update-status-text": "complementos actualizados"
       },
       "versions": {
-        "confirmation-text-1": "¿Seguro que quieres volver a la versión",
-        "confirmation-text-2": "Esta acción no es recomendable",
+        "confirmation-text": "",
         "downgrade-confirm": "Volver a versión anterior",
         "downgrade-title": "Volver a versión anterior del complemento"
       }
@@ -9825,6 +10099,10 @@
     "empty-state": {
       "message": "No se ha encontrado ningún complemento"
     },
+    "extensions": {
+      "extension-error-alert-description": "",
+      "extension-error-alert-title": ""
+    },
     "extensions-log-data-source": {
       "message": {
         "ok": "Aceptar"
@@ -9858,7 +10136,11 @@
       "updating": "Actualizando"
     },
     "install-controls-button": {
-      "title-uninstall-modal": "Desinstalar {{plugin}}"
+      "title-uninstall-modal": "Desinstalar {{plugin}}",
+      "uninstall-controls": {
+        "body-uninstall-plugin": "",
+        "confirmText-confirm": ""
+      }
     },
     "install-controls-warning": {
       "body-not-published": "Este plugin no está publicado en <2>grafana.com/plugins</2> y no se puede gestionar a través del catálogo.",
@@ -10894,6 +11176,7 @@
     }
   },
   "service-account-picker": {
+    "noOptionsMessage-no-service-accounts-found": "",
     "select-aria-label": "Selector de cuentas de servicio",
     "select-placeholder": "Empieza a escribir para buscar cuentas de servicio"
   },
@@ -10939,6 +11222,10 @@
     },
     "service-account-page-unconnected": {
       "add-service-account-token": "Añadir token de cuenta de servicio",
+      "body-delete-service-account": "",
+      "body-disable-service-account": "",
+      "confirmText-delete-service-account": "",
+      "confirmText-disable-service-account": "",
       "delete-service-account": "Eliminar cuenta de servicio",
       "disable-service-account": "Deshabilitar cuenta de servicio",
       "enable-service-account": "Habilitar cuenta de servicio",
@@ -10965,6 +11252,7 @@
       "used-by": "Usado por"
     },
     "service-account-profile-row": {
+      "confirmText-save": "",
       "edit": "Editar"
     },
     "service-account-role-row": {
@@ -10978,10 +11266,16 @@
     },
     "service-accounts-list-page-unconnected": {
       "add-service-account": "Añadir cuenta de servicio",
+      "body-delete-with-tokens": "",
+      "body-disable-service-account": "",
+      "confirmText-delete": "",
+      "confirmText-disable-service-account": "",
       "placeholder-search-service-account-by-name": "Buscar cuenta de servicio por nombre",
       "sub-title": "Las cuentas de servicio y sus tokens se pueden utilizar para autenticarse en la API de Grafana. Encuentra más información en nuestra <2>documentación.</2>",
       "title-delete-service-account": "Eliminar cuenta de servicio",
-      "title-disable-service-account": "Deshabilitar cuenta de servicio"
+      "title-disable-service-account": "Deshabilitar cuenta de servicio",
+      "body-delete_one": "",
+      "body-delete_other": ""
     },
     "token-expiration": {
       "content-this-token-has-expired": "El token ha caducado",
@@ -11373,7 +11667,7 @@
       "label-never": ""
     },
     "status-history-panel": {
-      "too-many-points_one": "Demasiados puntos para visualizar correctamente. <1></1>Actualice la consulta para devolver menos puntos. <3></3>({{count}} punto recibido)",
+      "too-many-points_one": "Demasiados puntos para visualizar correctamente. <1></1>Actualice la consulta para devolver menos puntos. <3></3>({{count}} puntos recibidos)",
       "too-many-points_other": "Demasiados puntos para visualizar correctamente. <1></1>Actualice la consulta para devolver menos puntos. <3></3>({{count}} puntos recibidos)"
     }
   },
@@ -11518,6 +11812,7 @@
     "tag-option-label": "Opción de etiqueta"
   },
   "team-picker": {
+    "noOptionsMessage-no-teams-found": "",
     "select-aria-label": "Selector de equipo",
     "select-placeholder": "Seleccionar un equipo"
   },
@@ -11843,6 +12138,7 @@
     "convert-field-type-transformer-editor": {
       "aria-label-add-a-convert-field-type-transformer": "Añadir un convertidor de tipo de campo",
       "aria-label-remove-convert-field-type-transformer": "Quitar convertidor de tipo de campo",
+      "convert-field-type": "",
       "label": {
         "browser": "Navegador",
         "utc": "UTC"
@@ -11885,6 +12181,11 @@
       "remove-enum-row-tooltip-delete": "Eliminar"
     },
     "extract-fields-transformer-editor": {
+      "field-name-picker-settings": {
+        "placeholderText": {
+          "select-field": ""
+        }
+      },
       "label-delimiter": "Delimitador",
       "label-format": "Formato",
       "label-keep-time": "Conservar la hora",
@@ -11898,6 +12199,14 @@
       "aria-label-threshold-color": "Color de umbral"
     },
     "field-lookup-transformer-editor": {
+      "field-name-picker-settings": {
+        "noFieldsMessage": {
+          "no-text-fields-found": ""
+        },
+        "placeholderText": {
+          "select-text-field": ""
+        }
+      },
       "label-field": "Campo",
       "label-lookup": "Búsqueda"
     },
@@ -11923,10 +12232,30 @@
     },
     "filter-by-value-transformer-editor": {
       "add-condition": "Añadir condición",
+      "filter-match": {
+        "label": {
+          "match-all": "",
+          "match-any": ""
+        }
+      },
+      "filter-types": {
+        "label": {
+          "exclude": "",
+          "include": ""
+        }
+      },
       "label-conditions": "Condiciones",
       "label-filter-type": "Tipo de filtro"
     },
     "format-string-transfomer-editor": {
+      "field-name-picker-settings": {
+        "noFieldsMessage": {
+          "no-text-fields-found": ""
+        },
+        "placeholderText": {
+          "select-text-field": ""
+        }
+      },
       "label-field": "Campo",
       "label-format": "Formato",
       "label-substring-range": "Rango de subcadena"
@@ -12237,6 +12566,7 @@
     "title": "Organizaciones"
   },
   "user-picker": {
+    "noOptionsMessage-no-users-found": "",
     "select-aria-label": "Selector de usuario",
     "select-placeholder": "Comienza a escribir para buscar un usuario"
   },
@@ -12322,6 +12652,8 @@
       }
     },
     "confirm-delete-modal": {
+      "body-delete-variable": "",
+      "confirmText-delete": "",
       "title-delete-variable": "Eliminar variable"
     },
     "create-ad-hoc-variable-adapter": {
@@ -12370,9 +12702,24 @@
       "label-refresh": "Actualizar"
     },
     "query-variable-sort-select": {
-      "description-values-variable": "Cómo ordenar los valores de esta variable"
+      "description-values-variable": "Cómo ordenar los valores de esta variable",
+      "name-sort": "",
+      "sort_options": {
+        "label": {
+          "alphabetical-asc": "",
+          "alphabetical-caseinsensitive-asc": "",
+          "alphabetical-caseinsensitive-desc": "",
+          "alphabetical-desc": "",
+          "disabled": "",
+          "natural-asc": "",
+          "natural-desc": "",
+          "numerical-asc": "",
+          "numerical-desc": ""
+        }
+      }
     },
     "text-box-variable-editor": {
+      "name-default-value": "",
       "placeholder-default-value-if-any": "valor predeterminado, si lo hay",
       "text-options": "Opciones de texto"
     },
@@ -12401,6 +12748,8 @@
       "description-optional-display-name": "Nombre para mostrar opcional",
       "description-template-variable-characters": "El nombre de la variable de la plantilla. (Máx. 50 caracteres)",
       "general": "General",
+      "name-label": "",
+      "name-name": "",
       "placeholder-descriptive-text": "Texto descriptivo",
       "placeholder-label-name": "Nombre de la etiqueta",
       "placeholder-variable-name": "Nombre de la variable",
@@ -12415,9 +12764,15 @@
       "tooltip-duplicate-variable": "Duplicar variable",
       "tooltip-remove-variable": "Quitar variable"
     },
+    "variable-editor-un-connected": {
+      "name-description": ""
+    },
     "variable-options": {
       "aria-label-toggle-all-values": "Alternar todos los valores"
     },
+    "variable-type-select": {
+      "name-select-variable-type": ""
+    },
     "variable-usages-button": {
       "tooltip-show-usages": "Mostrar usos"
     },
diff --git a/public/locales/fr-FR/grafana.json b/public/locales/fr-FR/grafana.json
index 7031be13c8e..e90b9bfca6e 100644
--- a/public/locales/fr-FR/grafana.json
+++ b/public/locales/fr-FR/grafana.json
@@ -84,6 +84,7 @@
     "admin-feature-toggles-table": {
       "confirm-modal-body-1": "Certaines fonctionnalités sont stables (GA) et activées par défaut, tandis que d’autres sont actuellement dans leur phase bêta préliminaire, disponibles pour une adoption précoce.",
       "confirm-modal-body-2": "Nous vous conseillons de comprendre les implications de chaque changement de fonctionnalité avant d’apporter des modifications.",
+      "confirmText-save-changes": "",
       "get-stage-cell": {
         "beta": "Bêta",
         "content-general-availability": "Disponibilité générale",
@@ -96,14 +97,21 @@
     },
     "admin-orgs-table": {
       "aria-label-delete-org": "Supprimer l’organisation",
+      "confirmText-delete": "",
       "title-delete": "Supprimer"
     },
     "anon-users": {
       "not-found": "Aucun utilisateur anonyme trouvé."
     },
     "base-user-sessions": {
+      "body-force-logout-from-all-devices": "",
+      "confirmText-confirm-logout": "",
+      "confirmText-force-logout": "",
       "title-force-logout-from-all-devices": "Forcer la déconnexion de tous les appareils"
     },
+    "change-org-button": {
+      "confirmText-save": ""
+    },
     "edit-org": {
       "access-denied": "Vous n'avez pas l'autorisation de consulter les utilisateurs de cette organisation. Pour mettre à jour cette organisation, contactez votre administrateur serveur.",
       "heading": "Modifier l'organisation",
@@ -208,9 +216,11 @@
       "not-editable": "Le rôle de cet utilisateur n'est pas modifiable, car il est synchronisé à partir de votre fournisseur d'authentification. Reportez-vous à la <1>Documentation d'authentification de Grafana</1> pour en savoir plus."
     },
     "org-users-table": {
+      "body-delete": "",
       "columns": {
         "aria-label-role": "Rôle"
       },
+      "confirmText-delete": "",
       "delete-aria-label": "Supprimer l’utilisateur : {{name}}",
       "title-delete": "Supprimer"
     },
@@ -241,6 +251,9 @@
     "settings": {
       "info-description": "Ces paramètres système sont définis dans grafana.ini ou custom.ini (ou remplacés par des variables ENV). Pour les modifier, vous devez actuellement relancer Grafana."
     },
+    "un-themed-org-row": {
+      "confirmText-confirm-removal": ""
+    },
     "upgrade-info": {
       "title": "Licence Enterprise"
     },
@@ -293,12 +306,17 @@
     },
     "user-permissions": {
       "change-button": "Changer",
+      "confirmText-change": "",
       "grafana-admin-key": "Administrateur Grafana",
       "grafana-admin-no": "Non",
       "grafana-admin-yes": "Oui",
       "title": "Autorisations"
     },
     "user-profile": {
+      "body-delete": "",
+      "body-disable": "",
+      "confirmText-delete-user": "",
+      "confirmText-disable-user": "",
       "delete-button": "Supprimer l'utilisateur",
       "disable-button": "Désactiver l'utilisateur",
       "edit-button": "Modifier",
@@ -312,6 +330,9 @@
       "title-delete-user": "Supprimer l'utilisateur",
       "title-disable-user": "Désactiver l’utilisateur"
     },
+    "user-profile-row": {
+      "confirmText-save": ""
+    },
     "user-sessions": {
       "browser-column": "Navigateur et système d'exploitation",
       "force-logout-all-button": "Forcer la déconnexion de tous les appareils",
@@ -461,6 +482,9 @@
       "label-muting-grouping-and-timings-optional": "Mise en sourdine, regroupement et horaires (facultatif)",
       "title-muting-grouping-and-timings": "Mise en sourdine, regroupement et horaires"
     },
+    "alert-manager-picker": {
+      "noOptionsMessage-no-datasources-found": ""
+    },
     "alert-menu": {
       "copy-link": "Copier le lien",
       "duplicate": "Dupliquer",
@@ -550,6 +574,7 @@
       "view-configuration": "Afficher la configuration"
     },
     "alertmanager-config": {
+      "confirmText-yes-reset-configuration": "",
       "gma-manual-configuration-description": "La configuration interne de Grafana Alertmanager ne peut pas être modifiée manuellement. Pour modifier cette configuration, modifiez les ressources individuelles via l’interface utilisateur.",
       "gma-manual-configuration-is-not-supported": "Les modifications de configuration manuelles ne sont pas prises en charge",
       "message": {
@@ -564,11 +589,13 @@
       "title-resetting-alertmanager-configuration": "Réinitialisation de la configuration d’Alertmanager"
     },
     "alertmanager-configuration-version-manager": {
+      "body-restore-configuration-version-unsaved-changes": "",
       "columns": {
         "compare": "Comparer",
         "restore": "Restaurer",
         "text-latest": "Dernier"
       },
+      "confirmText-yes-restore-configuration": "",
       "loading": "Chargement en cours...",
       "no-previous-configurations": "Aucune configuration précédente",
       "this-might-take-a-while": "Cela peut prendre un certain temps...",
@@ -848,8 +875,10 @@
     },
     "contact-point-header": {
       "aria-label-more-actions": "Plus d’actions pour le point de contact « {{contactPointName}} »",
+      "ariaLabel-delete": "",
       "button-edit": "Modifier",
       "button-view": "Afficher",
+      "export-ariaLabel-export": "",
       "export-label-export": "Exporter",
       "label-delete": "Supprimer",
       "label-manage-permissions": "Gérer les autorisations",
@@ -1384,6 +1413,7 @@
       "label-disable-resolved-message": "Désactiver le message résolu"
     },
     "grafana-evaluation-behavior-step": {
+      "loadingMessage-loading-groups": "",
       "message": {
         "must-be-a-positive-integer": "Doit être un entier positif.",
         "must-enter-a-group-name": "Vous devez saisir un nom de groupe"
@@ -1842,7 +1872,11 @@
             "other-data-sources": "Autres sources de données"
           }
         }
-      }
+      },
+      "noOptionsMessage-no-datasources-found": ""
+    },
+    "mute-timing-actions-button": {
+      "body-delete-mute-timing": ""
     },
     "mute-timing-actions-buttons": {
       "text-disabled": "Désactivé",
@@ -2093,9 +2127,11 @@
       "update-errors": {
         "conflict": "L'arborescence des politiques de notification a été mise à jour par un autre utilisateur.",
         "error-code": "Message d'erreur : « {{error}} »",
-        "fallback": "Une erreur s'est produite lors de la mise à jour de vos politiques de notification.",
+        "routes": {
+          "conflictingMatchers": ""
+        },
         "suffix": "Actualisez la page, puis réessayez.",
-        "title": "Erreur lors de l'enregistrement de la politique de notification"
+        "title": ""
       },
       "n-more-policies_one": "{{count}} politiques supplémentaires",
       "n-more-policies_other": "{{count}} politiques supplémentaires"
@@ -2151,6 +2187,7 @@
     "query-and-expressions-step": {
       "add-query": "Ajouter une requête",
       "body-queries-expressions-configured": "Créer au moins une requête ou une expression pour laquelle une alerte doit être émise",
+      "confirmText-deactivate": "",
       "expressions": "Expressions",
       "loading-data-sources": "Chargement des sources de données…",
       "manipulate-returned-queries-other-operations": "Manipulez les données renvoyées par les requêtes avec des opérations mathématiques et autres.",
@@ -2218,6 +2255,7 @@
     "redirect-to-clone-rule": {
       "body-evaluation-group": "Vous devrez définir un nouveau groupe d’évaluation pour la règle copiée, car la règle d’origine a été mise en service et ne peut pas être utilisée pour les règles créées dans l’interface utilisateur.",
       "body-not-provisioned": "La nouvelle règle <1>ne sera pas</1> marquée comme une règle mise en service.",
+      "confirmText-copy": "",
       "title-copy-provisioned-alert-rule": "Copier la règle d’alerte mise en service"
     },
     "redirect-to-rule-viewer": {
@@ -2415,8 +2453,6 @@
       "title-inspect-alert-rule": "Inspecter la règle d’alerte"
     },
     "rule-list": {
-      "cannot-find-rule-details-for": "Impossible de trouver les détails de la règle pour l’UID {{uid}}",
-      "cannot-load-rule-details-for": "Impossible de charger les détails de la règle pour l’UID {{uid}}",
       "configure-datasource": "Configurer",
       "draft-new-rule": "Rédiger une nouvelle règle",
       "ds-error": {
@@ -2766,6 +2802,9 @@
       "existing-templates-selector-placeholder-choose-notification-template": "Choisir un modèle de notification",
       "loading": "Chargement en cours...",
       "template-options": {
+        "ariaLabel": {
+          "select-notification-template": ""
+        },
         "label": {
           "select-notification-template": "Sélectionner un modèle de notification"
         }
@@ -2792,6 +2831,8 @@
     },
     "templates-table": {
       "actions": "Actions",
+      "body-delete-template-group": "",
+      "confirmText-yes-delete": "",
       "no-templates-defined": "Aucun modèle défini.",
       "template-group": "Groupe de modèles",
       "title-delete-template-group": "Supprimer le groupe de modèles"
@@ -2919,6 +2960,11 @@
         "title-delete-contact-point": "Supprimer le point de contact"
       }
     },
+    "use-delete-modal": {
+      "modal": {
+        "confirmText-yes-delete": ""
+      }
+    },
     "use-delete-policy-modal": {
       "modal-element": {
         "title-delete-notification-policy": "Supprimer la politique de notification"
@@ -3075,7 +3121,8 @@
     "annotation-field-mapper": {
       "annotation": "Annotation",
       "first-value": "Première valeur",
-      "from": ""
+      "from": "",
+      "noOptionsMessage-unknown-field-names": ""
     },
     "empty-state": {
       "button-title": "Ajouter une requête d'annotation",
@@ -3209,7 +3256,7 @@
       "team-ids-github": "Liste des ID d’équipe sous forme de nombres entiers.",
       "team-ids-label": "ID d’équipe",
       "team-ids-numbers": "Les ID d’équipe doivent être des nombres.",
-      "team-ids-other": "Liste des chaînes de caractères des identifiants d’équipe.",
+      "team-ids-other": "",
       "team-ids-placeholder": "Saisissez les ID d’équipe et appuyez sur Entrée pour ajouter",
       "teams-url-description": "L’URL utilisée pour interroger les ID d’équipe. Si elle n’est pas définie, la valeur par défaut est /teams.",
       "teams-url-description-oauth": "Si vous configurez « {{ teamsURLLabel }} », vous devez également configurer « {{ teamIDsAttributePathLabel }} ».",
@@ -3253,6 +3300,7 @@
       "additional-actions-menu": {
         "label-reset-to-default-values": "Rétablir les valeurs par défaut"
       },
+      "confirmText-reset": "",
       "disable": "Désactiver",
       "disabling": "Désactivation...",
       "discard": "Abandonner",
@@ -4180,8 +4228,8 @@
     }
   },
   "dashbaord-scene": {
-    "interval-variable-form": {
-      "description-auto-option": "Calcule dynamiquement l’intervalle en divisant la plage temporelle par le nombre spécifié"
+    "variable-editor-form": {
+      "run-query": ""
     }
   },
   "dashboard": {
@@ -4343,6 +4391,9 @@
     },
     "dash-nav": {
       "on-open-snapshot-original": {
+        "confirmText": {
+          "proceed": ""
+        },
         "title": {
           "proceed-to-external-site": "Accéder au site externe ?"
         }
@@ -4557,6 +4608,13 @@
           "editable": "Modifiable",
           "readonly": "Lecture seule"
         }
+      },
+      "graph_tooltip_options": {
+        "label": {
+          "default": "",
+          "shared-crosshair": "",
+          "shared-tooltip": ""
+        }
       }
     },
     "get-debug-dashboard": {
@@ -4861,6 +4919,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "Voulez-vous vraiment restaurer le tableau de bord dans sa version {{version}} ? Toutes les modifications non enregistrées seront perdues.",
+      "confirmText-restore-version": "",
       "title-restore-version": "Restaurer la version"
     },
     "row-options-button": {
@@ -4911,6 +4970,9 @@
         "title-not-unique": "Ce titre n’est pas unique"
       }
     },
+    "save-dashboard": {
+      "message-dashboard-saved": ""
+    },
     "save-dashboard-as-button": {
       "save-as": "Enregistrer sous"
     },
@@ -4945,6 +5007,7 @@
     "save-dashboard-error-proxy": {
       "body-name-exists": "Un tableau de bord du même nom existe déjà dans le dossier sélectionné.<1></1><2>Voulez-vous vraiment enregistrer ce tableau de bord ?</2>",
       "body-version-mismatch": "Quelqu’un d’autre a mis à jour ce tableau de bord<1></1><2>Voulez-vous vraiment enregistrer ce tableau de bord ?</2>",
+      "confirmText-save-and-overwrite": "",
       "title-name-exists": "Conflits",
       "title-version-mismatch": "Conflits"
     },
@@ -5141,7 +5204,9 @@
       "label-apply-transformation-to": "Appliquer la transformation vers"
     },
     "transformation-operation-row": {
+      "body-delete": "",
       "render-actions": {
+        "confirmText-delete": "",
         "title-debug": "Déboguer",
         "title-disable-transformation": "Désactiver la transformation",
         "title-filter": "Filtrer",
@@ -5163,10 +5228,14 @@
       "show-images": "Afficher les images",
       "title-add-another-transformation": "Ajouter une autre transformation"
     },
+    "un-theme-transformations-editor": {
+      "body-delete-all-transformations": ""
+    },
     "un-themed-transformations-editor": {
       "actions": {
         "add-another-transformation": "Ajouter une autre transformation"
       },
+      "confirmText-delete-all": "",
       "delete-all-transformations": "Supprimer toutes les transformations",
       "title-delete-all-transformations": "Supprimer toutes les transformations ?",
       "tooltip-clear-search": "Effacer la recherche",
@@ -5203,6 +5272,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "Basculer la sélection de la version {{version}}",
       "date": "Date",
+      "name-latest": "",
       "notes": "Remarques",
       "restore": "Restaurer",
       "updated-by": "Mise à jour par",
@@ -5279,7 +5349,8 @@
       "description-enables-users-custom-values": "Permet aux utilisateurs d’ajouter des valeurs personnalisées à la liste",
       "description-provide-dimensions-as-csv-dimension-name-dimension-id": "Fournir les dimensions en tant que CSV : {{name}}, {{value}}",
       "label-data-source": "Source de données",
-      "label-use-static-key-dimensions": "Utiliser des dimensions de clé statiques"
+      "label-use-static-key-dimensions": "Utiliser des dimensions de clé statiques",
+      "name-allow-custom-values": ""
     },
     "add-to-dashboard": {
       "message": {
@@ -5352,6 +5423,9 @@
       }
     },
     "config-public-dashboard": {
+      "confirmText": {
+        "revoke-public-url": ""
+      },
       "title": {
         "revoke-public-url": "Désactiver l'URL publique"
       }
@@ -5363,6 +5437,7 @@
     },
     "custom-variable-form": {
       "custom-options": "Personnaliser les options",
+      "name-values-separated-comma": "",
       "selection-options": "Options de sélection"
     },
     "dashboard-edit-pane-renderer": {
@@ -5381,6 +5456,12 @@
       "label-type": "Type",
       "label-url": "URL",
       "label-with-tags": "Avec les balises",
+      "link-type-options": {
+        "label": {
+          "dashboards": "",
+          "link": ""
+        }
+      },
       "placeholder-open-dashboard": "Ouvrir le tableau de bord"
     },
     "dashboard-link-list": {
@@ -5427,6 +5508,8 @@
       "data-source-options": "Options de source de données",
       "description-instance-name-filter": "Filtre Regex pour les instances de source de données à choisir dans la liste des valeurs de variable. Laisser vide pour tout.",
       "example-instance-name-filter": "Exemple : <codeExample />",
+      "name-instance-name-filter": "",
+      "name-type": "",
       "selection-options": "Options de sélection"
     },
     "default-grid-layout-manager": {
@@ -5472,6 +5555,21 @@
     "empty-transformations-message": {
       "add-transformation": "Ajouter une transformation"
     },
+    "general-settings-edit-view": {
+      "editable_options": {
+        "label": {
+          "editable": "",
+          "readonly": ""
+        }
+      },
+      "graph_tooltip_options": {
+        "label": {
+          "default": "",
+          "shared-crosshair": "",
+          "shared-tooltip": ""
+        }
+      }
+    },
     "get-edit-options": {
       "title": {
         "column-options": "Options de colonne",
@@ -5502,7 +5600,8 @@
       "description-provide-dimensions-as-csv-dimension-name-dimension-id": "Fournir les dimensions en tant que CSV : {{name}}, {{value}}",
       "group-by-options": "Regrouper par options",
       "label-data-source": "Source de données",
-      "label-use-static-group-by-dimensions": "Utiliser les dimensions de groupe statiques"
+      "label-use-static-group-by-dimensions": "Utiliser les dimensions de groupe statiques",
+      "name-allow-custom-values": ""
     },
     "help-wizard": {
       "copy-to-clipboard": "Copier dans le presse-papiers",
@@ -5538,9 +5637,14 @@
       "apply": "Appliquer"
     },
     "interval-variable-form": {
+      "description-auto-option": "",
       "description-calculated-value-below-threshold": "La valeur calculée ne descendra pas en dessous de ce seuil",
       "description-step-count": "Le nombre de divisions requis de la plage temporelle actuelle pour calculer la valeur",
-      "interval-options": "Options d’intervalle"
+      "interval-options": "Options d’intervalle",
+      "name-auto-option": "",
+      "name-min-interval": "",
+      "name-step-count": "",
+      "name-values": ""
     },
     "json-model-edit-view": {
       "cancel-button": {
@@ -5565,6 +5669,9 @@
       "title-name-already-exists": "Nom déjà existant"
     },
     "on-open-snapshot-original-dashboard": {
+      "confirmText": {
+        "proceed": ""
+      },
       "title": {
         "proceed-to-external-site": "Accéder au site externe ?"
       }
@@ -5600,6 +5707,8 @@
     },
     "panel-data-transformations-tab-rendered": {
       "add-another-transformation": "Ajouter une autre transformation",
+      "body-delete-all-transformations": "",
+      "confirmText-delete-all": "",
       "delete-all-transformations": "Supprimer toutes les transformations",
       "title-delete-all-transformations": "Supprimer toutes les transformations ?"
     },
@@ -5653,6 +5762,7 @@
       "description-optional": "Facultatif, si vous souhaitez extraire une partie d’un nom de série ou d’un segment de nœud de métrique.",
       "label-data-source": "Source de données",
       "label-target-data-source": "Source de données cible",
+      "name-regex": "",
       "query-options": "Options de recherche",
       "selection-options": "Options de sélection"
     },
@@ -5667,6 +5777,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "Voulez-vous vraiment restaurer le tableau de bord dans sa version {{version}} ? Toutes les modifications non enregistrées seront perdues.",
+      "confirmText-restore-version": "",
       "title-restore-version": "Restaurer la version"
     },
     "save-button": {
@@ -5760,7 +5871,11 @@
     "selection-options-form": {
       "description-enables-multiple-values-selected": "Permet de sélectionner plusieurs valeurs en même temps",
       "description-enables-option-include-variables": "Active une option pour inclure toutes les valeurs",
-      "description-enables-users-custom-values": "Permet aux utilisateurs d’ajouter des valeurs personnalisées à la liste"
+      "description-enables-users-custom-values": "Permet aux utilisateurs d’ajouter des valeurs personnalisées à la liste",
+      "name-allow-custom-values": "",
+      "name-custom-all-value": "",
+      "name-include-all-option": "",
+      "name-multi-value": ""
     },
     "share-button": {
       "aria-label-sharedropdownmenu": "Basculer le menu de partage"
@@ -5780,6 +5895,9 @@
         "copy-to-clipboard-failed": "Échec de la copie dans le presse-papiers"
       }
     },
+    "text-box-variable": {
+      "name-default-value": ""
+    },
     "text-box-variable-form": {
       "placeholder-default-value-if-any": "(facultatif)",
       "text-options": "Options de texte"
@@ -5803,6 +5921,8 @@
       }
     },
     "unlink-modal": {
+      "body-unlink-panel": "",
+      "confirmText-yes-unlink": "",
       "title-really-unlink-panel": "Voulez-vous vraiment dissocier ce panneau ?"
     },
     "unsaved-changes-modal": {
@@ -5819,6 +5939,9 @@
         }
       }
     },
+    "use-save-dashboard": {
+      "message-dashboard-saved": ""
+    },
     "variable-check-indicator": {
       "aria-label-variable-referenced-dashboard": "Cette variable n’est référencée par aucune variable ou aucun tableau de bord.",
       "aria-label-variable-referenced-other-variables-dashboard": "Cette variable est référencée par d’autres variables ou d’autres tableaux de bord.",
@@ -5828,10 +5951,16 @@
     "variable-editor-form": {
       "aria-label-variable-editor-form": "Formulaire de l’éditeur de variables",
       "back-to-list": "Retour à la liste",
+      "confirmText": {
+        "delete-variable": ""
+      },
       "delete": "Supprimer",
       "description-optional-display-name": "Nom d’affichage facultatif",
       "description-template-variable-characters": "Le nom de la variable du modèle. (50 caractères max)",
       "general": "Général",
+      "name-description": "",
+      "name-label": "",
+      "name-name": "",
       "placeholder-descriptive-text": "Texte de description",
       "placeholder-label-name": "Nom de l’étiquette",
       "placeholder-variable-name": "Nom de la variable",
@@ -5846,13 +5975,25 @@
       "variable": "Variable"
     },
     "variable-editor-list-row": {
+      "body-delete-variable": "",
+      "confirmText-delete-variable": "",
       "title-delete-variable": "Supprimer la variable",
       "tooltip-duplicate-variable": "Dupliquer la variable",
       "tooltip-remove-variable": "Supprimer la variable"
     },
     "variable-hide-select": {
+      "hide_options": {
+        "label": {
+          "label": "",
+          "nothing": "",
+          "variable": ""
+        }
+      },
       "label": "Masquer"
     },
+    "variable-type-select": {
+      "name-variable-type": ""
+    },
     "variable-usages-button": {
       "title-show-usages": "Afficher les usages pour : {{variableId}}",
       "tooltip-show-usages": "Afficher les usages"
@@ -5879,6 +6020,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "Basculer la sélection de la version {{version}}",
       "date": "Date",
+      "name-latest": "",
       "notes": "Remarques",
       "restore": "Restaurer",
       "updated-by": "Mise à jour par",
@@ -6266,7 +6408,8 @@
       }
     },
     "color-dimension-editor": {
-      "label-fixed-color": ""
+      "label-fixed-color": "",
+      "noOptionsMessage-no-fields-found": ""
     },
     "file-dropzone-custom-children": {
       "upload": "Charger"
@@ -6304,6 +6447,7 @@
       },
       "label-limit": "Limiter",
       "label-value": "Valeur",
+      "noOptionsMessage-no-fields-found": "",
       "scalar-options": {
         "description-clamped": "",
         "description-mod": "",
@@ -6312,9 +6456,15 @@
       }
     },
     "scale-dimension-editor": {
+      "fixed-value-option": {
+        "label": {
+          "fixed-value": ""
+        }
+      },
       "label-max": "Max",
       "label-min": "Min",
-      "label-value": "Valeur"
+      "label-value": "Valeur",
+      "noOptionsMessage-no-fields-found": ""
     },
     "text-dimension-editor": {
       "description-field": "",
@@ -6886,6 +7036,8 @@
       "aria-label-select-service-name-operator": "Sélectionner l’opérateur de nom de service",
       "aria-label-select-span-name": "Sélectionner le nom de la durée",
       "aria-label-select-span-name-operator": "Sélectionner l’opérateur de nom de la durée",
+      "ariaLabel-select-max-span-duration": "",
+      "ariaLabel-select-min-span-duration": "",
       "label-collapse": "Filtres de durée",
       "label-duration": "Durée",
       "label-service-name": "Nom du service",
@@ -6956,6 +7108,8 @@
       "split-widen": "Élargir le panneau"
     },
     "trace-page-actions": {
+      "ariaLabel-copy-trace-id": "",
+      "ariaLabel-export-trace": "",
       "give-feedback": "Publiez votre commentaire",
       "label-copied": "Copié !",
       "label-export": "Exporter",
@@ -7093,6 +7247,7 @@
   },
   "folder-filter": {
     "clear-folder-button": "Effacer les dossiers",
+    "noOptionsMessage-no-folders-found": "",
     "select-aria-label": "Filtre de dossier",
     "select-placeholder": "Filtrer par dossier"
   },
@@ -7161,7 +7316,53 @@
     "incomplete-request-error": "Désolé, je n'ai pas pu répondre à votre demande. Veuillez réessayer.",
     "send-custom-feedback": "Envoyer"
   },
+  "geo": {
+    "get-geometry-field": {
+      "warning-gazetteer-not-found": "",
+      "warning-no-geometry": "",
+      "warning-select-geohash": "",
+      "warning-select-lat-long": "",
+      "warning-select-lookup": "",
+      "warning-unable-to-find": ""
+    },
+    "location-editor": {
+      "geohash-field": {
+        "no-fields-message": ""
+      },
+      "latitude-field": {
+        "no-fields-message": ""
+      },
+      "longitude-field": {
+        "no-fields-message": ""
+      },
+      "lookup-field": {
+        "no-fields-message": ""
+      },
+      "name-gazetteer": "",
+      "name-geohash-field": "",
+      "name-latitude-field": "",
+      "name-location-mode": "",
+      "name-longitude-field": "",
+      "name-lookup-field": ""
+    },
+    "location-more-editor": {
+      "mode-options": {
+        "description-auto": "",
+        "description-coords": "",
+        "description-geohash": "",
+        "description-lookup": "",
+        "label-auto": "",
+        "label-coords": "",
+        "label-geohash": "",
+        "label-lookup": ""
+      }
+    }
+  },
   "geomap": {
+    "category-basemap-layer": "",
+    "category-map-controls": "",
+    "category-map-layers": "",
+    "category-map-view": "",
     "coordinates-map-view-editor": {
       "label-latitude": "Latitude",
       "label-longitude": "Longitude"
@@ -7170,6 +7371,14 @@
       "center": "Centre :",
       "zoom": "Zoom :"
     },
+    "description-initial-view": "",
+    "description-mouse-wheel-zoom": "",
+    "description-share-view": "",
+    "description-show-attribution": "",
+    "description-show-debug": "",
+    "description-show-measure": "",
+    "description-show-scale": "",
+    "description-show-zoom": "",
     "fit-map-view-editor": {
       "all-layers-editor-fragment": {
         "label-layer": "Couche"
@@ -7192,6 +7401,14 @@
     "geomap-style-rules-editor": {
       "aria-label-add-geomap-style-rule": "Ajouter une règle de style de carte géographique"
     },
+    "layer-editor": {
+      "category-base-layer": "",
+      "description-display-tooltip": "",
+      "name-data": "",
+      "name-display-tooltip": "",
+      "name-layer-type": "",
+      "name-opacity": ""
+    },
     "layers-editor": {
       "label-add-layer": "Ajouter une couche",
       "no-layers": "Pas de couche ?"
@@ -7202,16 +7419,38 @@
       "label-zoom": "Zoom",
       "use-current-map-settings": "Utiliser les paramètres actuels de la carte"
     },
+    "markers-layer": {
+      "description-show-legend": "",
+      "name-show-legend": "",
+      "name-styles": ""
+    },
     "markers-legend": {
       "title-symbol": "Symbole"
     },
     "measure-overlay": {
       "tooltip-show-measure-tools": "Afficher les outils de mesure"
     },
+    "name-initial-view": "",
+    "name-mouse-wheel-zoom": "",
+    "name-share-view": "",
+    "name-show-attribution": "",
+    "name-show-debug": "",
+    "name-show-measure": "",
+    "name-show-scale": "",
+    "name-show-zoom": "",
+    "name-tooltip": "",
+    "photos-layer": {
+      "noFieldsMessage-no-string-fields": ""
+    },
     "plugin": {
       "basemap-layer-configured-server-admin": "La couche de la carte de base est configurée par l’administrateur du serveur."
     },
     "style-editor": {
+      "horizontal-align-options": {
+        "label-center": "",
+        "label-left": "",
+        "label-right": ""
+      },
       "label-align": "Aligner",
       "label-baseline": "Valeur de référence",
       "label-color": "Couleur",
@@ -7225,7 +7464,14 @@
       "label-symbol-vertical-align": "Alignement vertical du symbole",
       "label-text-label": "Étiquette de texte",
       "label-x-offset": "Décalage X",
-      "label-y-offset": "Décalage Y"
+      "label-y-offset": "Décalage Y",
+      "placeholderText-select-symbol": "",
+      "placeholderText-select-symbol-or-add-text": "",
+      "vertical-align-options": {
+        "label-bottom": "",
+        "label-center": "",
+        "label-top": ""
+      }
     },
     "style-rule-editor": {
       "aria-label-comparison-operator": "Opérateur de comparaison",
@@ -7236,6 +7482,15 @@
       "placeholder-feature-property": "Propriété caractéristique",
       "placeholder-numeric-value": "Valeur numérique",
       "placeholder-value": "valeur"
+    },
+    "tooltip-options": {
+      "description-details": "",
+      "description-none": "",
+      "label-details": "",
+      "label-none": ""
+    },
+    "utils": {
+      "get-next-layer-name": ""
     }
   },
   "get-enterprise": {
@@ -7485,7 +7740,8 @@
       "aria-label-selected-color": "Couleur {{colorLabel}}"
     },
     "confirm-button": {
-      "cancel": "Annuler"
+      "cancel": "Annuler",
+      "confirmText-delete": ""
     },
     "confirm-content": {
       "placeholder": "Saisissez « {{confirmPromptText}} » pour confirmer"
@@ -7667,6 +7923,8 @@
     },
     "panel-chrome": {
       "aria-label-toggle-collapse": "basculer pour réduire le panneau",
+      "ariaLabel-panel-loading": "",
+      "ariaLabel-panel-status": "",
       "tooltip-cancel": "Annuler une requête",
       "tooltip-cancel-loading": "Annuler une requête",
       "tooltip-stop-streaming": "Arrêter la diffusion",
@@ -7834,6 +8092,12 @@
       "footer-click-to-action": "Cliquez pour {{actionTitle}}",
       "footer-click-to-navigate": "Cliquez pour ouvrir {{linkTitle}}",
       "timestamp": "Horodatage"
+    },
+    "week-start-picker": {
+      "weekStarts-label-default": "",
+      "weekStarts-label-monday": "",
+      "weekStarts-label-saturday": "",
+      "weekStarts-label-sunday": ""
     }
   },
   "graph": {
@@ -8212,6 +8476,10 @@
     "add-library-panel-modal": {
       "title-create-library-panel": "Créer un panneau Bibliothèque"
     },
+    "change-library-panel-modal": {
+      "confirmText-change": "",
+      "confirmText-replace": ""
+    },
     "confirm": {
       "delete-panel": "Voulez-vous vraiment supprimer ce panneau ?"
     },
@@ -8656,6 +8924,8 @@
       "updated-on": "Mise à niveau le"
     },
     "snapshot-list-table": {
+      "body-delete": "",
+      "confirmText-delete": "",
       "title-delete": "Supprimer"
     },
     "unthemed-dashboard-import": {
@@ -8667,6 +8937,9 @@
       }
     }
   },
+  "metric-select": {
+    "noOptionsMessage-no-options-found": ""
+  },
   "migrate-to-cloud": {
     "build-snapshot": {
       "description": "Cet outil permet de migrer certaines ressources de cette installation vers votre pile cloud. Pour commencer, vous devez créer un instantané de cette installation. La création d'un instantané prend généralement moins de deux minutes. L'instantané est stocké avec cette installation Grafana.",
@@ -9365,7 +9638,7 @@
     "marker": {
       "100-node-count": "> 100 nœuds",
       "aria-label-hidden-marker": "Marqueur de nœuds cachés : {{marker}}",
-      "node-count_one": "{{count}} nœud",
+      "node-count_one": "{{count}} nœuds",
       "node-count_other": "{{count}} nœuds"
     },
     "node": {
@@ -9376,9 +9649,9 @@
       "aria-label-nodes-hidden-warning": "Avertissement de nœuds cachés",
       "computing-layout": "Calcul de la disposition",
       "no-data": "Aucune donnée",
-      "hidden-nodes_one": "<0></0> {{count}} nœud est masqué pour des raisons de performances.",
+      "hidden-nodes_one": "<0></0> {{count}} nœuds sont masqués pour des raisons de performances.",
       "hidden-nodes_other": "<0></0> {{count}} nœuds sont masqués pour des raisons de performances.",
-      "processed-nodes_one": "<0></0> La disposition en couches peut être lente avec {{count}} nœud.",
+      "processed-nodes_one": "<0></0> La disposition en couches peut être lente avec {{count}} nœuds.",
       "processed-nodes_other": "<0></0> La disposition en couches peut être lente avec {{count}} nœuds."
     },
     "node-graph-panel": {
@@ -9505,6 +9778,7 @@
     }
   },
   "org-picker": {
+    "noOptionsMessage-no-organizations-found": "",
     "select-placeholder": "Sélectionner l’organisation"
   },
   "page": {
@@ -9727,6 +10001,7 @@
         "permission": "Vous n’avez pas l’autorisation requise pour consulter cette page.",
         "title-access-denied": "Accès refusé"
       },
+      "error-loading-plugin": "",
       "no-root-app-page-component-found": "Aucun composant de page d’application racine trouvé"
     },
     "browse": {
@@ -9770,8 +10045,7 @@
         "update-status-text": "mise à jour des plugins"
       },
       "versions": {
-        "confirmation-text-1": "Voulez-vous vraiment rétrograder pour la version",
-        "confirmation-text-2": "Vous ne devriez normalement pas faire cela",
+        "confirmation-text": "",
         "downgrade-confirm": "Rétrograder de version",
         "downgrade-title": "Rétrograder à la version précédente du plugin"
       }
@@ -9825,6 +10099,10 @@
     "empty-state": {
       "message": "Aucune extension trouvée"
     },
+    "extensions": {
+      "extension-error-alert-description": "",
+      "extension-error-alert-title": ""
+    },
     "extensions-log-data-source": {
       "message": {
         "ok": "OK"
@@ -9858,7 +10136,11 @@
       "updating": "Mise à jour en cours"
     },
     "install-controls-button": {
-      "title-uninstall-modal": "Désinstaller {{plugin}}"
+      "title-uninstall-modal": "Désinstaller {{plugin}}",
+      "uninstall-controls": {
+        "body-uninstall-plugin": "",
+        "confirmText-confirm": ""
+      }
     },
     "install-controls-warning": {
       "body-not-published": "Ce plugin n’est pas publié sur <2>grafana.com/plugins</2> et ne peut pas être géré via le catalogue.",
@@ -10894,6 +11176,7 @@
     }
   },
   "service-account-picker": {
+    "noOptionsMessage-no-service-accounts-found": "",
     "select-aria-label": "Sélecteur de compte de service",
     "select-placeholder": "Commencez à saisir du texte pour rechercher des comptes de service"
   },
@@ -10939,6 +11222,10 @@
     },
     "service-account-page-unconnected": {
       "add-service-account-token": "Ajouter un jeton de compte de service",
+      "body-delete-service-account": "",
+      "body-disable-service-account": "",
+      "confirmText-delete-service-account": "",
+      "confirmText-disable-service-account": "",
       "delete-service-account": "Supprimer le compte de service",
       "disable-service-account": "Désactiver le compte de service",
       "enable-service-account": "Activer le compte de service",
@@ -10965,6 +11252,7 @@
       "used-by": "Utilisé par"
     },
     "service-account-profile-row": {
+      "confirmText-save": "",
       "edit": "Modifier"
     },
     "service-account-role-row": {
@@ -10978,10 +11266,16 @@
     },
     "service-accounts-list-page-unconnected": {
       "add-service-account": "Ajouter un compte de service",
+      "body-delete-with-tokens": "",
+      "body-disable-service-account": "",
+      "confirmText-delete": "",
+      "confirmText-disable-service-account": "",
       "placeholder-search-service-account-by-name": "Rechercher un compte de service par son nom",
       "sub-title": "Les comptes de service et leurs jetons peuvent être utilisés pour s’authentifier auprès de l’API Grafana. Pour en savoir plus, consultez notre <2>documentation.</2>",
       "title-delete-service-account": "Supprimer le compte de service",
-      "title-disable-service-account": "Désactiver le compte de service"
+      "title-disable-service-account": "Désactiver le compte de service",
+      "body-delete_one": "",
+      "body-delete_other": ""
     },
     "token-expiration": {
       "content-this-token-has-expired": "Ce jeton a expiré",
@@ -11373,7 +11667,7 @@
       "label-never": ""
     },
     "status-history-panel": {
-      "too-many-points_one": "Trop de points pour visualiser correctement. <1></1>Mettez à jour la requête pour renvoyer moins de points. <3></3>({{count}} point reçu)",
+      "too-many-points_one": "Trop de points pour visualiser correctement. <1></1>Mettez à jour la requête pour renvoyer moins de points. <3></3>({{count}} points reçus)",
       "too-many-points_other": "Trop de points pour visualiser correctement. <1></1>Mettez à jour la requête pour renvoyer moins de points. <3></3>({{count}} points reçus)"
     }
   },
@@ -11518,6 +11812,7 @@
     "tag-option-label": "Option de balise"
   },
   "team-picker": {
+    "noOptionsMessage-no-teams-found": "",
     "select-aria-label": "Sélecteur d’équipe",
     "select-placeholder": "Sélectionner une équipe"
   },
@@ -11843,6 +12138,7 @@
     "convert-field-type-transformer-editor": {
       "aria-label-add-a-convert-field-type-transformer": "Ajouter un transformateur de type de champ de conversion",
       "aria-label-remove-convert-field-type-transformer": "Supprimer le transformateur de type de champ de conversion",
+      "convert-field-type": "",
       "label": {
         "browser": "Navigateur",
         "utc": "UTC"
@@ -11885,6 +12181,11 @@
       "remove-enum-row-tooltip-delete": "Supprimer"
     },
     "extract-fields-transformer-editor": {
+      "field-name-picker-settings": {
+        "placeholderText": {
+          "select-field": ""
+        }
+      },
       "label-delimiter": "Délimiteur",
       "label-format": "Format",
       "label-keep-time": "Conserver l’horaire",
@@ -11898,6 +12199,14 @@
       "aria-label-threshold-color": "Couleur du seuil"
     },
     "field-lookup-transformer-editor": {
+      "field-name-picker-settings": {
+        "noFieldsMessage": {
+          "no-text-fields-found": ""
+        },
+        "placeholderText": {
+          "select-text-field": ""
+        }
+      },
       "label-field": "Champ",
       "label-lookup": "Recherche"
     },
@@ -11923,10 +12232,30 @@
     },
     "filter-by-value-transformer-editor": {
       "add-condition": "Ajouter une condition",
+      "filter-match": {
+        "label": {
+          "match-all": "",
+          "match-any": ""
+        }
+      },
+      "filter-types": {
+        "label": {
+          "exclude": "",
+          "include": ""
+        }
+      },
       "label-conditions": "Conditions",
       "label-filter-type": "Type de filtre"
     },
     "format-string-transfomer-editor": {
+      "field-name-picker-settings": {
+        "noFieldsMessage": {
+          "no-text-fields-found": ""
+        },
+        "placeholderText": {
+          "select-text-field": ""
+        }
+      },
       "label-field": "Champ",
       "label-format": "Format",
       "label-substring-range": "Plage de sous-chaînes de caractères"
@@ -12237,6 +12566,7 @@
     "title": "Organisations"
   },
   "user-picker": {
+    "noOptionsMessage-no-users-found": "",
     "select-aria-label": "Sélecteur d’utilisateur",
     "select-placeholder": "Commencez à saisir du texte pour rechercher un utilisateur"
   },
@@ -12322,6 +12652,8 @@
       }
     },
     "confirm-delete-modal": {
+      "body-delete-variable": "",
+      "confirmText-delete": "",
       "title-delete-variable": "Supprimer la variable"
     },
     "create-ad-hoc-variable-adapter": {
@@ -12370,9 +12702,24 @@
       "label-refresh": "Actualiser"
     },
     "query-variable-sort-select": {
-      "description-values-variable": "Comment trier les valeurs de cette variable"
+      "description-values-variable": "Comment trier les valeurs de cette variable",
+      "name-sort": "",
+      "sort_options": {
+        "label": {
+          "alphabetical-asc": "",
+          "alphabetical-caseinsensitive-asc": "",
+          "alphabetical-caseinsensitive-desc": "",
+          "alphabetical-desc": "",
+          "disabled": "",
+          "natural-asc": "",
+          "natural-desc": "",
+          "numerical-asc": "",
+          "numerical-desc": ""
+        }
+      }
     },
     "text-box-variable-editor": {
+      "name-default-value": "",
       "placeholder-default-value-if-any": "valeur par défaut, le cas échéant",
       "text-options": "Options de texte"
     },
@@ -12401,6 +12748,8 @@
       "description-optional-display-name": "Nom d’affichage facultatif",
       "description-template-variable-characters": "Le nom de la variable du modèle. (50 caractères max)",
       "general": "Général",
+      "name-label": "",
+      "name-name": "",
       "placeholder-descriptive-text": "Texte de description",
       "placeholder-label-name": "Nom de l’étiquette",
       "placeholder-variable-name": "Nom de la variable",
@@ -12415,9 +12764,15 @@
       "tooltip-duplicate-variable": "Dupliquer la variable",
       "tooltip-remove-variable": "Supprimer la variable"
     },
+    "variable-editor-un-connected": {
+      "name-description": ""
+    },
     "variable-options": {
       "aria-label-toggle-all-values": "Basculer toutes les valeurs"
     },
+    "variable-type-select": {
+      "name-select-variable-type": ""
+    },
     "variable-usages-button": {
       "tooltip-show-usages": "Afficher les usages"
     },
diff --git a/public/locales/hu-HU/grafana.json b/public/locales/hu-HU/grafana.json
index a6462ff2003..b928b853b78 100644
--- a/public/locales/hu-HU/grafana.json
+++ b/public/locales/hu-HU/grafana.json
@@ -84,6 +84,7 @@
     "admin-feature-toggles-table": {
       "confirm-modal-body-1": "Egyes funkciók stabilak (GA), és alapértelmezés szerint engedélyezve vannak, míg mások jelenleg előzetes béta fázisban vannak, és korai bevezetéshez állnak rendelkezésre.",
       "confirm-modal-body-2": "Javasoljuk, hogy a módosítások végrehajtása előtt ismerje meg az egyes funkciók módosításának következményeit.",
+      "confirmText-save-changes": "",
       "get-stage-cell": {
         "beta": "Béta",
         "content-general-availability": "Általános elérhetőség",
@@ -96,14 +97,21 @@
     },
     "admin-orgs-table": {
       "aria-label-delete-org": "Szervezet törlése",
+      "confirmText-delete": "",
       "title-delete": "Törlés"
     },
     "anon-users": {
       "not-found": "Nem található névtelen felhasználó."
     },
     "base-user-sessions": {
+      "body-force-logout-from-all-devices": "",
+      "confirmText-confirm-logout": "",
+      "confirmText-force-logout": "",
       "title-force-logout-from-all-devices": "Kijelentkezés kényszerítése minden eszközön"
     },
+    "change-org-button": {
+      "confirmText-save": ""
+    },
     "edit-org": {
       "access-denied": "Nincs engedélye a felhasználók megtekintésére ebben a szervezetben. A szervezet frissítéséhez forduljon a kiszolgáló rendszergazdájához.",
       "heading": "Szervezet szerkesztése",
@@ -208,9 +216,11 @@
       "not-editable": "Ennek a felhasználónak a szerepköre nem szerkeszthető, mert szinkronizálva van az Ön hitelesítési szolgáltatójával. További részletekért olvassa el a <1>Grafana hitelesítési dokumentációját</1>."
     },
     "org-users-table": {
+      "body-delete": "",
       "columns": {
         "aria-label-role": "Szerepkör"
       },
+      "confirmText-delete": "",
       "delete-aria-label": "Felhasználó törlése: {{name}}",
       "title-delete": "Törlés"
     },
@@ -241,6 +251,9 @@
     "settings": {
       "info-description": "Ezek a rendszerbeállítások a grafana.ini vagy a custom.ini fájlban vannak meghatározva (vagy felülbírálva az ENV-változókban). Ezek módosításához jelenleg újra kell indítania a Grafanát."
     },
+    "un-themed-org-row": {
+      "confirmText-confirm-removal": ""
+    },
     "upgrade-info": {
       "title": "Vállalati licenc"
     },
@@ -293,12 +306,17 @@
     },
     "user-permissions": {
       "change-button": "Módosítás",
+      "confirmText-change": "",
       "grafana-admin-key": "Grafana-rendszergazda",
       "grafana-admin-no": "Nem",
       "grafana-admin-yes": "Igen",
       "title": "Engedélyek"
     },
     "user-profile": {
+      "body-delete": "",
+      "body-disable": "",
+      "confirmText-delete-user": "",
+      "confirmText-disable-user": "",
       "delete-button": "Felhasználó törlése",
       "disable-button": "Felhasználó letiltása",
       "edit-button": "Szerkesztés",
@@ -312,6 +330,9 @@
       "title-delete-user": "Felhasználó törlése",
       "title-disable-user": "Felhasználó letiltása"
     },
+    "user-profile-row": {
+      "confirmText-save": ""
+    },
     "user-sessions": {
       "browser-column": "Böngésző és operációs rendszer",
       "force-logout-all-button": "Kijelentkezés kényszerítése minden eszközön",
@@ -461,6 +482,9 @@
       "label-muting-grouping-and-timings-optional": "Némítás, csoportosítás és időzítés (opcionális)",
       "title-muting-grouping-and-timings": "Némítás, csoportosítás és időzítés"
     },
+    "alert-manager-picker": {
+      "noOptionsMessage-no-datasources-found": ""
+    },
     "alert-menu": {
       "copy-link": "Hivatkozás másolása",
       "duplicate": "Duplikálás",
@@ -550,6 +574,7 @@
       "view-configuration": "Nézet konfigurációja"
     },
     "alertmanager-config": {
+      "confirmText-yes-reset-configuration": "",
       "gma-manual-configuration-description": "A belső Grafana riasztáskezelő-konfiguráció manuálisan nem módosítható. A konfiguráció módosításához szerkessze az egyes erőforrásokat a felhasználói felületen keresztül.",
       "gma-manual-configuration-is-not-supported": "A manuális konfigurációs módosítások nem támogatottak",
       "message": {
@@ -564,11 +589,13 @@
       "title-resetting-alertmanager-configuration": "Riasztáskezelő konfigurációjának visszaállítása"
     },
     "alertmanager-configuration-version-manager": {
+      "body-restore-configuration-version-unsaved-changes": "",
       "columns": {
         "compare": "Összehasonlítás",
         "restore": "Visszaállítás",
         "text-latest": "Legújabb"
       },
+      "confirmText-yes-restore-configuration": "",
       "loading": "Betöltés...",
       "no-previous-configurations": "Nincsenek előző konfigurációk",
       "this-might-take-a-while": "Ez hosszabb időt is igénybe vehet…",
@@ -848,8 +875,10 @@
     },
     "contact-point-header": {
       "aria-label-more-actions": "További műveletek a(z) „{{contactPointName}}” kapcsolattartási ponthoz",
+      "ariaLabel-delete": "",
       "button-edit": "Szerkesztés",
       "button-view": "Nézet",
+      "export-ariaLabel-export": "",
       "export-label-export": "Exportálás",
       "label-delete": "Törlés",
       "label-manage-permissions": "Engedélyek kezelése",
@@ -1384,6 +1413,7 @@
       "label-disable-resolved-message": "Megoldott üzenet letiltása"
     },
     "grafana-evaluation-behavior-step": {
+      "loadingMessage-loading-groups": "",
       "message": {
         "must-be-a-positive-integer": "Pozitív egész számnak kell lennie.",
         "must-enter-a-group-name": "A csoportnév megadása kötelező"
@@ -1842,7 +1872,11 @@
             "other-data-sources": "Egyéb adatforrások"
           }
         }
-      }
+      },
+      "noOptionsMessage-no-datasources-found": ""
+    },
+    "mute-timing-actions-button": {
+      "body-delete-mute-timing": ""
     },
     "mute-timing-actions-buttons": {
       "text-disabled": "Letiltva",
@@ -2093,9 +2127,11 @@
       "update-errors": {
         "conflict": "Az értesítési házirendfáját egy másik felhasználó frissítette.",
         "error-code": "Hibaüzenet: „{{error}}”",
-        "fallback": "Valami hiba történt az értesítési házirendjei frissítése során.",
+        "routes": {
+          "conflictingMatchers": ""
+        },
         "suffix": "Kérjük, frissítse az oldalt, és próbálkozzon újra.",
-        "title": "Hiba történt az értesítési házirend mentésekor"
+        "title": ""
       },
       "n-more-policies_one": "{{count}} további házirend",
       "n-more-policies_other": "{{count}} további házirend"
@@ -2151,6 +2187,7 @@
     "query-and-expressions-step": {
       "add-query": "Lekérdezés hozzáadása",
       "body-queries-expressions-configured": "Hozzon létre legalább egy lekérdezést vagy kifejezést, amelyre riasztást kap",
+      "confirmText-deactivate": "",
       "expressions": "Kifejezések",
       "loading-data-sources": "Adatforrások betöltése…",
       "manipulate-returned-queries-other-operations": "A lekérdezésekből visszaadott adatok manipulálása matematikai és egyéb műveletekkel.",
@@ -2218,6 +2255,7 @@
     "redirect-to-clone-rule": {
       "body-evaluation-group": "A másolt szabályhoz új értékelési csoportot kell beállítania, mert az eredeti ki van építve, és nem használható a felhasználói felületen létrehozott szabályokhoz.",
       "body-not-provisioned": "Az új szabály <1>nem</1> lesz kiépített szabályként megjelölve.",
+      "confirmText-copy": "",
       "title-copy-provisioned-alert-rule": "Kiépített riasztási szabály másolása"
     },
     "redirect-to-rule-viewer": {
@@ -2415,8 +2453,6 @@
       "title-inspect-alert-rule": "Riasztási szabály vizsgálata"
     },
     "rule-list": {
-      "cannot-find-rule-details-for": "A szabály részletei nem találhatók a(z) {{uid}} UID-hez",
-      "cannot-load-rule-details-for": "A szabály részletei nem tölthetők be a(z) {{uid}} UID-hez",
       "configure-datasource": "Konfigurálás",
       "draft-new-rule": "Új szabály felvázolása",
       "ds-error": {
@@ -2766,6 +2802,9 @@
       "existing-templates-selector-placeholder-choose-notification-template": "Válasszon értesítési sablont",
       "loading": "Betöltés...",
       "template-options": {
+        "ariaLabel": {
+          "select-notification-template": ""
+        },
         "label": {
           "select-notification-template": "Értesítési sablon kiválasztása"
         }
@@ -2792,6 +2831,8 @@
     },
     "templates-table": {
       "actions": "Műveletek",
+      "body-delete-template-group": "",
+      "confirmText-yes-delete": "",
       "no-templates-defined": "Nincs meghatározott sablon.",
       "template-group": "Sabloncsoport",
       "title-delete-template-group": "Sabloncsoport törlése"
@@ -2919,6 +2960,11 @@
         "title-delete-contact-point": "Kapcsolattartási pont törlése"
       }
     },
+    "use-delete-modal": {
+      "modal": {
+        "confirmText-yes-delete": ""
+      }
+    },
     "use-delete-policy-modal": {
       "modal-element": {
         "title-delete-notification-policy": "Értesítési házirend törlése"
@@ -3075,7 +3121,8 @@
     "annotation-field-mapper": {
       "annotation": "Jegyzet",
       "first-value": "Első érték",
-      "from": ""
+      "from": "",
+      "noOptionsMessage-unknown-field-names": ""
     },
     "empty-state": {
       "button-title": "Jegyzetlekérdezés hozzáadása",
@@ -3209,7 +3256,7 @@
       "team-ids-github": "Csapatazonosítók egész számos listája.",
       "team-ids-label": "Csapatazonosítók",
       "team-ids-numbers": "A csapatazonosítóknak számoknak kell lenniük.",
-      "team-ids-other": "Csapatazonosítók karakterláncos listája.",
+      "team-ids-other": "",
       "team-ids-placeholder": "Adja meg a csapatazonosítókat, és nyomja le az Enter billentyűt a hozzáadáshoz",
       "teams-url-description": "A csapatazonosítók lekérdezéséhez használt URL-cím. Ha nincs beállítva, az alapértelmezett érték a /teams.",
       "teams-url-description-oauth": "Ha konfigurálja a(z) „{{ teamsURLLabel }}” elemet, konfigurálni kell a(z) „{{ teamIDsAttributePathLabel }}” elemet is.",
@@ -3253,6 +3300,7 @@
       "additional-actions-menu": {
         "label-reset-to-default-values": "Visszaállítás az alapértelmezett értékekre"
       },
+      "confirmText-reset": "",
       "disable": "Letiltás",
       "disabling": "Letiltás folyamatban…",
       "discard": "Elvetés",
@@ -4180,8 +4228,8 @@
     }
   },
   "dashbaord-scene": {
-    "interval-variable-form": {
-      "description-auto-option": "Dinamikusan kiszámítja az intervallumot úgy, hogy az időtartományt elosztja a megadott számmal"
+    "variable-editor-form": {
+      "run-query": ""
     }
   },
   "dashboard": {
@@ -4343,6 +4391,9 @@
     },
     "dash-nav": {
       "on-open-snapshot-original": {
+        "confirmText": {
+          "proceed": ""
+        },
         "title": {
           "proceed-to-external-site": "Tovább a külső webhelyre?"
         }
@@ -4557,6 +4608,13 @@
           "editable": "Szerkeszthető",
           "readonly": "Csak olvasható"
         }
+      },
+      "graph_tooltip_options": {
+        "label": {
+          "default": "",
+          "shared-crosshair": "",
+          "shared-tooltip": ""
+        }
       }
     },
     "get-debug-dashboard": {
@@ -4861,6 +4919,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "Biztosan visszaállítja az irányítópultot a(z) {{version}} verzióra? Az összes nem mentett módosítás elveszik.",
+      "confirmText-restore-version": "",
       "title-restore-version": "Verzió visszaállítása"
     },
     "row-options-button": {
@@ -4911,6 +4970,9 @@
         "title-not-unique": "Ez a cím nem egyedi"
       }
     },
+    "save-dashboard": {
+      "message-dashboard-saved": ""
+    },
     "save-dashboard-as-button": {
       "save-as": "Mentés másként"
     },
@@ -4945,6 +5007,7 @@
     "save-dashboard-error-proxy": {
       "body-name-exists": "Egy irányítópult már létezik ugyanazzal a névvel a kijelölt mappában.<1></1><2>Biztosan menti ezt az irányítópultot?</2>",
       "body-version-mismatch": "Valaki más frissítette ezt az irányítópultot<1></1><2>Biztosan menti ezt az irányítópultot?</2>",
+      "confirmText-save-and-overwrite": "",
       "title-name-exists": "Ütközés",
       "title-version-mismatch": "Ütközés"
     },
@@ -5141,7 +5204,9 @@
       "label-apply-transformation-to": "Transzformáció alkalmazása erre:"
     },
     "transformation-operation-row": {
+      "body-delete": "",
       "render-actions": {
+        "confirmText-delete": "",
         "title-debug": "Hibakeresés",
         "title-disable-transformation": "Transzformáció letiltása",
         "title-filter": "Szűrő",
@@ -5163,10 +5228,14 @@
       "show-images": "Képek megjelenítése",
       "title-add-another-transformation": "Másik transzformáció hozzáadása"
     },
+    "un-theme-transformations-editor": {
+      "body-delete-all-transformations": ""
+    },
     "un-themed-transformations-editor": {
       "actions": {
         "add-another-transformation": "Másik transzformáció hozzáadása"
       },
+      "confirmText-delete-all": "",
       "delete-all-transformations": "Összes transzformáció törlése",
       "title-delete-all-transformations": "Törli az összes transzformációt?",
       "tooltip-clear-search": "Keresés törlése",
@@ -5203,6 +5272,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "Verzió kijelölésének ki- és bekapcsolása: {{version}}",
       "date": "Dátum",
+      "name-latest": "",
       "notes": "Megjegyzések",
       "restore": "Visszaállítás",
       "updated-by": "Frissítette:",
@@ -5279,7 +5349,8 @@
       "description-enables-users-custom-values": "Lehetővé teszi a felhasználók számára, hogy egyéni értékeket adjanak a listához",
       "description-provide-dimensions-as-csv-dimension-name-dimension-id": "Méretek megadása CSV-ként: {{name}}, {{value}}",
       "label-data-source": "Adatforrás",
-      "label-use-static-key-dimensions": "Statikus kulcsméretek használata"
+      "label-use-static-key-dimensions": "Statikus kulcsméretek használata",
+      "name-allow-custom-values": ""
     },
     "add-to-dashboard": {
       "message": {
@@ -5352,6 +5423,9 @@
       }
     },
     "config-public-dashboard": {
+      "confirmText": {
+        "revoke-public-url": ""
+      },
       "title": {
         "revoke-public-url": "Nyilvános URL-cím visszavonása"
       }
@@ -5363,6 +5437,7 @@
     },
     "custom-variable-form": {
       "custom-options": "Egyéni opciók",
+      "name-values-separated-comma": "",
       "selection-options": "Kijelölés beállításai"
     },
     "dashboard-edit-pane-renderer": {
@@ -5381,6 +5456,12 @@
       "label-type": "Típus",
       "label-url": "URL-cím",
       "label-with-tags": "Címkékkel",
+      "link-type-options": {
+        "label": {
+          "dashboards": "",
+          "link": ""
+        }
+      },
       "placeholder-open-dashboard": "Irányítópult megnyitása"
     },
     "dashboard-link-list": {
@@ -5427,6 +5508,8 @@
       "data-source-options": "Adatforrás beállításai",
       "description-instance-name-filter": "Reguláris kifejezéses szűrő, amelyhez adatforráspéldányokat választhat a változóérték-listában. Hagyja üresen minden esetben.",
       "example-instance-name-filter": "Példa: <codeExample /> ",
+      "name-instance-name-filter": "",
+      "name-type": "",
       "selection-options": "Kijelölés beállításai"
     },
     "default-grid-layout-manager": {
@@ -5472,6 +5555,21 @@
     "empty-transformations-message": {
       "add-transformation": "Transzformáció hozzáadása"
     },
+    "general-settings-edit-view": {
+      "editable_options": {
+        "label": {
+          "editable": "",
+          "readonly": ""
+        }
+      },
+      "graph_tooltip_options": {
+        "label": {
+          "default": "",
+          "shared-crosshair": "",
+          "shared-tooltip": ""
+        }
+      }
+    },
     "get-edit-options": {
       "title": {
         "column-options": "Oszlopbeállítások",
@@ -5502,7 +5600,8 @@
       "description-provide-dimensions-as-csv-dimension-name-dimension-id": "Méretek megadása CSV-ként: {{name}}, {{value}}",
       "group-by-options": "Csoportosítási beállítások",
       "label-data-source": "Adatforrás",
-      "label-use-static-group-by-dimensions": "Statikus csoportméretek használata"
+      "label-use-static-group-by-dimensions": "Statikus csoportméretek használata",
+      "name-allow-custom-values": ""
     },
     "help-wizard": {
       "copy-to-clipboard": "Másolás vágólapra",
@@ -5538,9 +5637,14 @@
       "apply": "Alkalmaz"
     },
     "interval-variable-form": {
+      "description-auto-option": "",
       "description-calculated-value-below-threshold": "A számított érték nem csökkenhet e küszöbérték alá",
       "description-step-count": "Hányszor kell az aktuális időtartományt elosztani az érték kiszámításához?",
-      "interval-options": "Intervallum beállításai"
+      "interval-options": "Intervallum beállításai",
+      "name-auto-option": "",
+      "name-min-interval": "",
+      "name-step-count": "",
+      "name-values": ""
     },
     "json-model-edit-view": {
       "cancel-button": {
@@ -5565,6 +5669,9 @@
       "title-name-already-exists": "A név már létezik"
     },
     "on-open-snapshot-original-dashboard": {
+      "confirmText": {
+        "proceed": ""
+      },
       "title": {
         "proceed-to-external-site": "Tovább a külső webhelyre?"
       }
@@ -5600,6 +5707,8 @@
     },
     "panel-data-transformations-tab-rendered": {
       "add-another-transformation": "Másik transzformáció hozzáadása",
+      "body-delete-all-transformations": "",
+      "confirmText-delete-all": "",
       "delete-all-transformations": "Összes transzformáció törlése",
       "title-delete-all-transformations": "Törli az összes transzformációt?"
     },
@@ -5653,6 +5762,7 @@
       "description-optional": "Opcionális, ha egy sorozatnév vagy metrikai csomópontszegmens egy részét szeretné kinyerni.",
       "label-data-source": "Adatforrás",
       "label-target-data-source": "Céladatforrás",
+      "name-regex": "",
       "query-options": "Lekérdezési beállítások",
       "selection-options": "Kijelölés beállításai"
     },
@@ -5667,6 +5777,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "Biztosan visszaállítja az irányítópultot a(z) {{version}} verzióra? Az összes nem mentett módosítás elveszik.",
+      "confirmText-restore-version": "",
       "title-restore-version": "Verzió visszaállítása"
     },
     "save-button": {
@@ -5760,7 +5871,11 @@
     "selection-options-form": {
       "description-enables-multiple-values-selected": "Lehetővé teszi több érték egyidejű kijelölését",
       "description-enables-option-include-variables": "Lehetővé teszi az összes érték belefoglalását",
-      "description-enables-users-custom-values": "Lehetővé teszi a felhasználók számára, hogy egyéni értékeket adjanak a listához"
+      "description-enables-users-custom-values": "Lehetővé teszi a felhasználók számára, hogy egyéni értékeket adjanak a listához",
+      "name-allow-custom-values": "",
+      "name-custom-all-value": "",
+      "name-include-all-option": "",
+      "name-multi-value": ""
     },
     "share-button": {
       "aria-label-sharedropdownmenu": "Menümegosztás ki- és bekapcsolása"
@@ -5780,6 +5895,9 @@
         "copy-to-clipboard-failed": "Nem sikerült a vágólapra másolás"
       }
     },
+    "text-box-variable": {
+      "name-default-value": ""
+    },
     "text-box-variable-form": {
       "placeholder-default-value-if-any": "(opcionális)",
       "text-options": "Szövegbeállítások"
@@ -5803,6 +5921,8 @@
       }
     },
     "unlink-modal": {
+      "body-unlink-panel": "",
+      "confirmText-yes-unlink": "",
       "title-really-unlink-panel": "Biztosan leválasztja ezt a panelt?"
     },
     "unsaved-changes-modal": {
@@ -5819,6 +5939,9 @@
         }
       }
     },
+    "use-save-dashboard": {
+      "message-dashboard-saved": ""
+    },
     "variable-check-indicator": {
       "aria-label-variable-referenced-dashboard": "Erre a változóra egyetlen változó vagy irányítópult sem hivatkozik.",
       "aria-label-variable-referenced-other-variables-dashboard": "Erre a változóra más változó vagy irányítópult hivatkozik.",
@@ -5828,10 +5951,16 @@
     "variable-editor-form": {
       "aria-label-variable-editor-form": "Változószerkesztő űrlap",
       "back-to-list": "Vissza a listához",
+      "confirmText": {
+        "delete-variable": ""
+      },
       "delete": "Törlés",
       "description-optional-display-name": "Opcionális megjelenítendő név",
       "description-template-variable-characters": "A sablonváltozó neve. (Max. 50 karakter)",
       "general": "Általános",
+      "name-description": "",
+      "name-label": "",
+      "name-name": "",
       "placeholder-descriptive-text": "Leírószöveg",
       "placeholder-label-name": "Címkenév",
       "placeholder-variable-name": "Változónév",
@@ -5846,13 +5975,25 @@
       "variable": "Változó"
     },
     "variable-editor-list-row": {
+      "body-delete-variable": "",
+      "confirmText-delete-variable": "",
       "title-delete-variable": "Változó törlése",
       "tooltip-duplicate-variable": "Duplikált változó",
       "tooltip-remove-variable": "Változó eltávolítása"
     },
     "variable-hide-select": {
+      "hide_options": {
+        "label": {
+          "label": "",
+          "nothing": "",
+          "variable": ""
+        }
+      },
       "label": "Elrejtés"
     },
+    "variable-type-select": {
+      "name-variable-type": ""
+    },
     "variable-usages-button": {
       "title-show-usages": "Használat megjelenítése a következőhöz: {{variableId}}",
       "tooltip-show-usages": "Használatok megjelenítése"
@@ -5879,6 +6020,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "Verzió kijelölésének ki- és bekapcsolása: {{version}}",
       "date": "Dátum",
+      "name-latest": "",
       "notes": "Megjegyzések",
       "restore": "Visszaállítás",
       "updated-by": "Frissítette:",
@@ -6266,7 +6408,8 @@
       }
     },
     "color-dimension-editor": {
-      "label-fixed-color": ""
+      "label-fixed-color": "",
+      "noOptionsMessage-no-fields-found": ""
     },
     "file-dropzone-custom-children": {
       "upload": "Feltöltés"
@@ -6304,6 +6447,7 @@
       },
       "label-limit": "Korlát",
       "label-value": "Érték",
+      "noOptionsMessage-no-fields-found": "",
       "scalar-options": {
         "description-clamped": "",
         "description-mod": "",
@@ -6312,9 +6456,15 @@
       }
     },
     "scale-dimension-editor": {
+      "fixed-value-option": {
+        "label": {
+          "fixed-value": ""
+        }
+      },
       "label-max": "Max.",
       "label-min": "Min.",
-      "label-value": "Érték"
+      "label-value": "Érték",
+      "noOptionsMessage-no-fields-found": ""
     },
     "text-dimension-editor": {
       "description-field": "",
@@ -6886,6 +7036,8 @@
       "aria-label-select-service-name-operator": "Válasszon operátort a szolgáltatásnévhez",
       "aria-label-select-span-name": "Válasszon terjedelemnevet",
       "aria-label-select-span-name-operator": "Terjedelemnév operátor kijelölése",
+      "ariaLabel-select-max-span-duration": "",
+      "ariaLabel-select-min-span-duration": "",
       "label-collapse": "Terjedelemszűrők",
       "label-duration": "Időtartam",
       "label-service-name": "Szolgáltatásnév",
@@ -6956,6 +7108,8 @@
       "split-widen": "Ablaktábla szélesítése"
     },
     "trace-page-actions": {
+      "ariaLabel-copy-trace-id": "",
+      "ariaLabel-export-trace": "",
       "give-feedback": "Visszajelzés küldése",
       "label-copied": "Kimásolva!",
       "label-export": "Exportálás",
@@ -7093,6 +7247,7 @@
   },
   "folder-filter": {
     "clear-folder-button": "Mappák törlése",
+    "noOptionsMessage-no-folders-found": "",
     "select-aria-label": "Mappaszűrő",
     "select-placeholder": "Szűrés mappa alapján"
   },
@@ -7161,7 +7316,53 @@
     "incomplete-request-error": "Sajnos nem sikerült teljesíteni a kérését. Próbálkozzon újra.",
     "send-custom-feedback": "Küldés"
   },
+  "geo": {
+    "get-geometry-field": {
+      "warning-gazetteer-not-found": "",
+      "warning-no-geometry": "",
+      "warning-select-geohash": "",
+      "warning-select-lat-long": "",
+      "warning-select-lookup": "",
+      "warning-unable-to-find": ""
+    },
+    "location-editor": {
+      "geohash-field": {
+        "no-fields-message": ""
+      },
+      "latitude-field": {
+        "no-fields-message": ""
+      },
+      "longitude-field": {
+        "no-fields-message": ""
+      },
+      "lookup-field": {
+        "no-fields-message": ""
+      },
+      "name-gazetteer": "",
+      "name-geohash-field": "",
+      "name-latitude-field": "",
+      "name-location-mode": "",
+      "name-longitude-field": "",
+      "name-lookup-field": ""
+    },
+    "location-more-editor": {
+      "mode-options": {
+        "description-auto": "",
+        "description-coords": "",
+        "description-geohash": "",
+        "description-lookup": "",
+        "label-auto": "",
+        "label-coords": "",
+        "label-geohash": "",
+        "label-lookup": ""
+      }
+    }
+  },
   "geomap": {
+    "category-basemap-layer": "",
+    "category-map-controls": "",
+    "category-map-layers": "",
+    "category-map-view": "",
     "coordinates-map-view-editor": {
       "label-latitude": "Szélességi fok",
       "label-longitude": "Hosszúsági fok"
@@ -7170,6 +7371,14 @@
       "center": "Középre:",
       "zoom": "Nagyítás:"
     },
+    "description-initial-view": "",
+    "description-mouse-wheel-zoom": "",
+    "description-share-view": "",
+    "description-show-attribution": "",
+    "description-show-debug": "",
+    "description-show-measure": "",
+    "description-show-scale": "",
+    "description-show-zoom": "",
     "fit-map-view-editor": {
       "all-layers-editor-fragment": {
         "label-layer": "Réteg"
@@ -7192,6 +7401,14 @@
     "geomap-style-rules-editor": {
       "aria-label-add-geomap-style-rule": "Geomap-stílusszabály hozzáadása"
     },
+    "layer-editor": {
+      "category-base-layer": "",
+      "description-display-tooltip": "",
+      "name-data": "",
+      "name-display-tooltip": "",
+      "name-layer-type": "",
+      "name-opacity": ""
+    },
     "layers-editor": {
       "label-add-layer": "Réteg hozzáadása",
       "no-layers": "Nincs réteg?"
@@ -7202,16 +7419,38 @@
       "label-zoom": "Nagyítás",
       "use-current-map-settings": "Aktuális térképbeállítások használata"
     },
+    "markers-layer": {
+      "description-show-legend": "",
+      "name-show-legend": "",
+      "name-styles": ""
+    },
     "markers-legend": {
       "title-symbol": "Szimbólum"
     },
     "measure-overlay": {
       "tooltip-show-measure-tools": "Mérőeszközök megjelenítése"
     },
+    "name-initial-view": "",
+    "name-mouse-wheel-zoom": "",
+    "name-share-view": "",
+    "name-show-attribution": "",
+    "name-show-debug": "",
+    "name-show-measure": "",
+    "name-show-scale": "",
+    "name-show-zoom": "",
+    "name-tooltip": "",
+    "photos-layer": {
+      "noFieldsMessage-no-string-fields": ""
+    },
     "plugin": {
       "basemap-layer-configured-server-admin": "Az alaptérkép rétegét a kiszolgáló rendszergazdája konfigurálja."
     },
     "style-editor": {
+      "horizontal-align-options": {
+        "label-center": "",
+        "label-left": "",
+        "label-right": ""
+      },
       "label-align": "Illesztés",
       "label-baseline": "Alapvonal",
       "label-color": "Szín",
@@ -7225,7 +7464,14 @@
       "label-symbol-vertical-align": "Szimbólum függőleges igazítása",
       "label-text-label": "Szöveges címke",
       "label-x-offset": "X eltolás",
-      "label-y-offset": "Y eltolás"
+      "label-y-offset": "Y eltolás",
+      "placeholderText-select-symbol": "",
+      "placeholderText-select-symbol-or-add-text": "",
+      "vertical-align-options": {
+        "label-bottom": "",
+        "label-center": "",
+        "label-top": ""
+      }
     },
     "style-rule-editor": {
       "aria-label-comparison-operator": "Összehasonlítás műveleti jele",
@@ -7236,6 +7482,15 @@
       "placeholder-feature-property": "Funkciótulajdonság",
       "placeholder-numeric-value": "Számérték",
       "placeholder-value": "érték"
+    },
+    "tooltip-options": {
+      "description-details": "",
+      "description-none": "",
+      "label-details": "",
+      "label-none": ""
+    },
+    "utils": {
+      "get-next-layer-name": ""
     }
   },
   "get-enterprise": {
@@ -7485,7 +7740,8 @@
       "aria-label-selected-color": "{{colorLabel}} szín"
     },
     "confirm-button": {
-      "cancel": "Mégse"
+      "cancel": "Mégse",
+      "confirmText-delete": ""
     },
     "confirm-content": {
       "placeholder": "„{{confirmPromptText}}” beírása szükséges a megerősítéshez"
@@ -7667,6 +7923,8 @@
     },
     "panel-chrome": {
       "aria-label-toggle-collapse": "panel összecsukásának ki- és bekapcsolása",
+      "ariaLabel-panel-loading": "",
+      "ariaLabel-panel-status": "",
       "tooltip-cancel": "A lekérdezés megszakítása",
       "tooltip-cancel-loading": "A lekérdezés megszakítása",
       "tooltip-stop-streaming": "Adatfolyam leállítása",
@@ -7834,6 +8092,12 @@
       "footer-click-to-action": "Kattintson ehhez: {{actionTitle}}",
       "footer-click-to-navigate": "Kattintson a következő megnyitásához: {{linkTitle}}",
       "timestamp": "Időbélyeg"
+    },
+    "week-start-picker": {
+      "weekStarts-label-default": "",
+      "weekStarts-label-monday": "",
+      "weekStarts-label-saturday": "",
+      "weekStarts-label-sunday": ""
     }
   },
   "graph": {
@@ -8212,6 +8476,10 @@
     "add-library-panel-modal": {
       "title-create-library-panel": "Könyvtárpanel létrehozása"
     },
+    "change-library-panel-modal": {
+      "confirmText-change": "",
+      "confirmText-replace": ""
+    },
     "confirm": {
       "delete-panel": "Biztosan törli ezt a panelt?"
     },
@@ -8656,6 +8924,8 @@
       "updated-on": "Frissítve:"
     },
     "snapshot-list-table": {
+      "body-delete": "",
+      "confirmText-delete": "",
       "title-delete": "Törlés"
     },
     "unthemed-dashboard-import": {
@@ -8667,6 +8937,9 @@
       }
     }
   },
+  "metric-select": {
+    "noOptionsMessage-no-options-found": ""
+  },
   "migrate-to-cloud": {
     "build-snapshot": {
       "description": "Ez az eszköz áttelepíthet bizonyos erőforrásokat ebből a telepített példányból a felhőstackbe. A kezdéshez létre kell hoznia egy pillanatfelvételt erről a telepített példányról. A pillanatfelvétel létrehozása általában kevesebb mint két percet vesz igénybe. A pillanatfelvételt ezen Grafana-telepítés mellett tárolja a rendszer.",
@@ -9505,6 +9778,7 @@
     }
   },
   "org-picker": {
+    "noOptionsMessage-no-organizations-found": "",
     "select-placeholder": "Szervezet kijelölése"
   },
   "page": {
@@ -9727,6 +10001,7 @@
         "permission": "Nincs engedélye az oldal megtekintésére.",
         "title-access-denied": "Hozzáférés megtagadva"
       },
+      "error-loading-plugin": "",
       "no-root-app-page-component-found": "Nem található a gyökéralkalmazás oldalkomponense"
     },
     "browse": {
@@ -9770,8 +10045,7 @@
         "update-status-text": "frissített bővítmény"
       },
       "versions": {
-        "confirmation-text-1": "Biztosan visszalép erre a verzióra:",
-        "confirmation-text-2": "Általában nem lenne szabad ezt tennie",
+        "confirmation-text": "",
         "downgrade-confirm": "Visszalépés",
         "downgrade-title": "Visszalépés korábbi bővítményverzióra"
       }
@@ -9825,6 +10099,10 @@
     "empty-state": {
       "message": "Nem található bővítmény"
     },
+    "extensions": {
+      "extension-error-alert-description": "",
+      "extension-error-alert-title": ""
+    },
     "extensions-log-data-source": {
       "message": {
         "ok": "OK"
@@ -9858,7 +10136,11 @@
       "updating": "Frissítés"
     },
     "install-controls-button": {
-      "title-uninstall-modal": "{{plugin}} eltávolítása"
+      "title-uninstall-modal": "{{plugin}} eltávolítása",
+      "uninstall-controls": {
+        "body-uninstall-plugin": "",
+        "confirmText-confirm": ""
+      }
     },
     "install-controls-warning": {
       "body-not-published": "Ez a bővítmény nincs közzétéve a <2>grafana.com/plugins</2> weboldalon, és nem kezelhető a katalóguson keresztül.",
@@ -10894,6 +11176,7 @@
     }
   },
   "service-account-picker": {
+    "noOptionsMessage-no-service-accounts-found": "",
     "select-aria-label": "Szolgáltatási fiókválasztó",
     "select-placeholder": "Kezdjen el gépelni a szolgáltatási fiókok kereséséhez"
   },
@@ -10939,6 +11222,10 @@
     },
     "service-account-page-unconnected": {
       "add-service-account-token": "Szolgáltatási fióktoken hozzáadása",
+      "body-delete-service-account": "",
+      "body-disable-service-account": "",
+      "confirmText-delete-service-account": "",
+      "confirmText-disable-service-account": "",
       "delete-service-account": "Szolgáltatási fiók törlése",
       "disable-service-account": "Szolgáltatási fiók letiltása",
       "enable-service-account": "Szolgáltatási fiók engedélyezése",
@@ -10965,6 +11252,7 @@
       "used-by": "Felhasználta:"
     },
     "service-account-profile-row": {
+      "confirmText-save": "",
       "edit": "Szerkesztés"
     },
     "service-account-role-row": {
@@ -10978,10 +11266,16 @@
     },
     "service-accounts-list-page-unconnected": {
       "add-service-account": "Szolgáltatási fiók hozzáadása",
+      "body-delete-with-tokens": "",
+      "body-disable-service-account": "",
+      "confirmText-delete": "",
+      "confirmText-disable-service-account": "",
       "placeholder-search-service-account-by-name": "Szolgáltatási fiók keresése név alapján",
       "sub-title": "A szolgáltatási fiókok és tokenjeik felhasználhatók a Grafana API-val történő hitelesítésre. További információkat a <2>dokumentációnkban talál.</2>",
       "title-delete-service-account": "Szolgáltatási fiók törlése",
-      "title-disable-service-account": "Szolgáltatási fiók letiltása"
+      "title-disable-service-account": "Szolgáltatási fiók letiltása",
+      "body-delete_one": "",
+      "body-delete_other": ""
     },
     "token-expiration": {
       "content-this-token-has-expired": "A token lejárt",
@@ -11518,6 +11812,7 @@
     "tag-option-label": "Címkézési opció"
   },
   "team-picker": {
+    "noOptionsMessage-no-teams-found": "",
     "select-aria-label": "Csapatválasztó",
     "select-placeholder": "Csapat kijelölése"
   },
@@ -11843,6 +12138,7 @@
     "convert-field-type-transformer-editor": {
       "aria-label-add-a-convert-field-type-transformer": "Konvertálandó mezőtípusú transzformátor hozzáadása",
       "aria-label-remove-convert-field-type-transformer": "Konvertálandó mezőtípusú transzformátor eltávolítása",
+      "convert-field-type": "",
       "label": {
         "browser": "Böngésző",
         "utc": "UTC"
@@ -11885,6 +12181,11 @@
       "remove-enum-row-tooltip-delete": "Törlés"
     },
     "extract-fields-transformer-editor": {
+      "field-name-picker-settings": {
+        "placeholderText": {
+          "select-field": ""
+        }
+      },
       "label-delimiter": "Elválasztójel",
       "label-format": "Formátum",
       "label-keep-time": "Megőrzési idő",
@@ -11898,6 +12199,14 @@
       "aria-label-threshold-color": "Küszöb színe"
     },
     "field-lookup-transformer-editor": {
+      "field-name-picker-settings": {
+        "noFieldsMessage": {
+          "no-text-fields-found": ""
+        },
+        "placeholderText": {
+          "select-text-field": ""
+        }
+      },
       "label-field": "Mező",
       "label-lookup": "Keresés"
     },
@@ -11923,10 +12232,30 @@
     },
     "filter-by-value-transformer-editor": {
       "add-condition": "Feltétel hozzáadása",
+      "filter-match": {
+        "label": {
+          "match-all": "",
+          "match-any": ""
+        }
+      },
+      "filter-types": {
+        "label": {
+          "exclude": "",
+          "include": ""
+        }
+      },
       "label-conditions": "Feltételek",
       "label-filter-type": "Szűrő típusa"
     },
     "format-string-transfomer-editor": {
+      "field-name-picker-settings": {
+        "noFieldsMessage": {
+          "no-text-fields-found": ""
+        },
+        "placeholderText": {
+          "select-text-field": ""
+        }
+      },
       "label-field": "Mező",
       "label-format": "Formátum",
       "label-substring-range": "Részkarakterlánc-tartomány"
@@ -12237,6 +12566,7 @@
     "title": "Szervezetek"
   },
   "user-picker": {
+    "noOptionsMessage-no-users-found": "",
     "select-aria-label": "Felhasználóválasztó",
     "select-placeholder": "Kezdjen el gépelni a felhasználó kereséséhez"
   },
@@ -12322,6 +12652,8 @@
       }
     },
     "confirm-delete-modal": {
+      "body-delete-variable": "",
+      "confirmText-delete": "",
       "title-delete-variable": "Változó törlése"
     },
     "create-ad-hoc-variable-adapter": {
@@ -12370,9 +12702,24 @@
       "label-refresh": "Frissítés"
     },
     "query-variable-sort-select": {
-      "description-values-variable": "Hogyan kell rendezni ennek a változónak az értékeit?"
+      "description-values-variable": "Hogyan kell rendezni ennek a változónak az értékeit?",
+      "name-sort": "",
+      "sort_options": {
+        "label": {
+          "alphabetical-asc": "",
+          "alphabetical-caseinsensitive-asc": "",
+          "alphabetical-caseinsensitive-desc": "",
+          "alphabetical-desc": "",
+          "disabled": "",
+          "natural-asc": "",
+          "natural-desc": "",
+          "numerical-asc": "",
+          "numerical-desc": ""
+        }
+      }
     },
     "text-box-variable-editor": {
+      "name-default-value": "",
       "placeholder-default-value-if-any": "alapértelmezett érték, ha van",
       "text-options": "Szövegbeállítások"
     },
@@ -12401,6 +12748,8 @@
       "description-optional-display-name": "Opcionális megjelenítendő név",
       "description-template-variable-characters": "A sablonváltozó neve. (Max. 50 karakter)",
       "general": "Általános",
+      "name-label": "",
+      "name-name": "",
       "placeholder-descriptive-text": "Leírószöveg",
       "placeholder-label-name": "Címkenév",
       "placeholder-variable-name": "Változónév",
@@ -12415,9 +12764,15 @@
       "tooltip-duplicate-variable": "Duplikált változó",
       "tooltip-remove-variable": "Változó eltávolítása"
     },
+    "variable-editor-un-connected": {
+      "name-description": ""
+    },
     "variable-options": {
       "aria-label-toggle-all-values": "Összes érték ki- és bekapcsolása"
     },
+    "variable-type-select": {
+      "name-select-variable-type": ""
+    },
     "variable-usages-button": {
       "tooltip-show-usages": "Használatok megjelenítése"
     },
diff --git a/public/locales/id-ID/grafana.json b/public/locales/id-ID/grafana.json
index f35230e46cb..e6b6a904801 100644
--- a/public/locales/id-ID/grafana.json
+++ b/public/locales/id-ID/grafana.json
@@ -84,6 +84,7 @@
     "admin-feature-toggles-table": {
       "confirm-modal-body-1": "Beberapa fitur stabil (GA) dan diaktifkan secara default, sedangkan beberapa fitur lainnya saat ini dalam fase Beta awal, tersedia untuk penggunaan awal.",
       "confirm-modal-body-2": "Sebaiknya pahami implikasi dari setiap perubahan fitur sebelum melakukan modifikasi.",
+      "confirmText-save-changes": "",
       "get-stage-cell": {
         "beta": "Beta",
         "content-general-availability": "Ketersediaan umum",
@@ -96,14 +97,21 @@
     },
     "admin-orgs-table": {
       "aria-label-delete-org": "Hapus org",
+      "confirmText-delete": "",
       "title-delete": "Hapus"
     },
     "anon-users": {
       "not-found": "Pengguna anonim tidak ditemukan."
     },
     "base-user-sessions": {
+      "body-force-logout-from-all-devices": "",
+      "confirmText-confirm-logout": "",
+      "confirmText-force-logout": "",
       "title-force-logout-from-all-devices": "Paksa keluar dari semua perangkat"
     },
+    "change-org-button": {
+      "confirmText-save": ""
+    },
     "edit-org": {
       "access-denied": "Anda tidak memiliki izin untuk melihat pengguna di organisasi ini. Untuk memperbarui organisasi ini, hubungi administrator server Anda.",
       "heading": "Edit Organisasi",
@@ -208,9 +216,11 @@
       "not-editable": "Peran pengguna ini tidak dapat diedit karena disinkronkan dari penyedia autentikasi Anda. Lihat <1> dokumen autentikasi Grafana </1> untuk detailnya."
     },
     "org-users-table": {
+      "body-delete": "",
       "columns": {
         "aria-label-role": "Peran"
       },
+      "confirmText-delete": "",
       "delete-aria-label": "Hapus pengguna: {{name}}",
       "title-delete": "Hapus"
     },
@@ -241,6 +251,9 @@
     "settings": {
       "info-description": "Pengaturan sistem ini ditentukan dalam grafana.ini atau custom.ini (atau ditimpa dalam variabel ENV). Untuk mengubahnya, saat ini Anda perlu memulai ulang Grafana."
     },
+    "un-themed-org-row": {
+      "confirmText-confirm-removal": ""
+    },
     "upgrade-info": {
       "title": "Lisensi Enterprise"
     },
@@ -293,12 +306,17 @@
     },
     "user-permissions": {
       "change-button": "Ubah",
+      "confirmText-change": "",
       "grafana-admin-key": "Admin Grafana",
       "grafana-admin-no": "Tidak",
       "grafana-admin-yes": "Ya",
       "title": "Izin"
     },
     "user-profile": {
+      "body-delete": "",
+      "body-disable": "",
+      "confirmText-delete-user": "",
+      "confirmText-disable-user": "",
       "delete-button": "Hapus pengguna",
       "disable-button": "Nonaktifkan pengguna",
       "edit-button": "Edit",
@@ -312,6 +330,9 @@
       "title-delete-user": "Hapus pengguna",
       "title-disable-user": "Nonaktifkan pengguna"
     },
+    "user-profile-row": {
+      "confirmText-save": ""
+    },
     "user-sessions": {
       "browser-column": "Browser dan OS",
       "force-logout-all-button": "Paksa keluar dari semua perangkat",
@@ -457,6 +478,9 @@
       "label-muting-grouping-and-timings-optional": "Pembisuan, pengelompokan, dan pengaturan waktu (opsional)",
       "title-muting-grouping-and-timings": "Pembisuan, pengelompokan, dan pengaturan waktu"
     },
+    "alert-manager-picker": {
+      "noOptionsMessage-no-datasources-found": ""
+    },
     "alert-menu": {
       "copy-link": "Salin tautan",
       "duplicate": "Duplikasikan",
@@ -546,6 +570,7 @@
       "view-configuration": "Lihat konfigurasi"
     },
     "alertmanager-config": {
+      "confirmText-yes-reset-configuration": "",
       "gma-manual-configuration-description": "Konfigurasi internal Alertmanager Grafana tidak dapat diubah secara manual. Untuk mengubah konfigurasi ini, edit setiap sumber daya melalui UI.",
       "gma-manual-configuration-is-not-supported": "Perubahan konfigurasi manual tidak didukung",
       "message": {
@@ -560,11 +585,13 @@
       "title-resetting-alertmanager-configuration": "Mengatur ulang konfigurasi Alertmanager"
     },
     "alertmanager-configuration-version-manager": {
+      "body-restore-configuration-version-unsaved-changes": "",
       "columns": {
         "compare": "Bandingkan",
         "restore": "Pulihkan",
         "text-latest": "Terkini"
       },
+      "confirmText-yes-restore-configuration": "",
       "loading": "Memuat...",
       "no-previous-configurations": "Tidak ada konfigurasi sebelumnya",
       "this-might-take-a-while": "Harap tunggu...",
@@ -844,8 +871,10 @@
     },
     "contact-point-header": {
       "aria-label-more-actions": "Tindakan lainnya untuk titik kontak \"{{contactPointName}}\"",
+      "ariaLabel-delete": "",
       "button-edit": "Edit",
       "button-view": "Lihat",
+      "export-ariaLabel-export": "",
       "export-label-export": "Ekspor",
       "label-delete": "Hapus",
       "label-manage-permissions": "Kelola izin",
@@ -1378,6 +1407,7 @@
       "label-disable-resolved-message": "Nonaktifkan pesan terselesaikan"
     },
     "grafana-evaluation-behavior-step": {
+      "loadingMessage-loading-groups": "",
       "message": {
         "must-be-a-positive-integer": "Harus berupa bilangan bulat positif.",
         "must-enter-a-group-name": "Harus memasukkan nama grup"
@@ -1835,7 +1865,11 @@
             "other-data-sources": "Sumber data lain"
           }
         }
-      }
+      },
+      "noOptionsMessage-no-datasources-found": ""
+    },
+    "mute-timing-actions-button": {
+      "body-delete-mute-timing": ""
     },
     "mute-timing-actions-buttons": {
       "text-disabled": "Dinonaktifkan",
@@ -2085,9 +2119,11 @@
       "update-errors": {
         "conflict": "Pohon kebijakan pemberitahuan telah diperbarui oleh pengguna lain.",
         "error-code": "Pesan kesalahan: \"{{error}}\"",
-        "fallback": "Terjadi kesalahan saat memperbarui kebijakan pemberitahuan Anda.",
+        "routes": {
+          "conflictingMatchers": ""
+        },
         "suffix": "Muat ulang halaman untuk mencoba lagi.",
-        "title": "Kesalahan saat menyimpan kebijakan pemberitahuan"
+        "title": ""
       },
       "n-more-policies_other": "{{count}} kebijakan tambahan"
     },
@@ -2142,6 +2178,7 @@
     "query-and-expressions-step": {
       "add-query": "Tambahkan kueri",
       "body-queries-expressions-configured": "Buat setidaknya satu kueri atau pola untuk diperingatkan",
+      "confirmText-deactivate": "",
       "expressions": "Pola",
       "loading-data-sources": "Memuat sumber data...",
       "manipulate-returned-queries-other-operations": "Manipulasi data yang dikembalikan dari kueri dengan matematika dan operasi lainnya.",
@@ -2209,6 +2246,7 @@
     "redirect-to-clone-rule": {
       "body-evaluation-group": "Anda perlu mengatur grup evaluasi baru untuk aturan yang disalin karena grup evaluasi awal telah disediakan dan tidak dapat digunakan untuk aturan yang dibuat di UI.",
       "body-not-provisioned": "Aturan baru tidak <1>akan</1> ditandai sebagai aturan yang disediakan.",
+      "confirmText-copy": "",
       "title-copy-provisioned-alert-rule": "Salin aturan peringatan yang disediakan"
     },
     "redirect-to-rule-viewer": {
@@ -2405,8 +2443,6 @@
       "title-inspect-alert-rule": "Periksa aturan Peringatan"
     },
     "rule-list": {
-      "cannot-find-rule-details-for": "Tidak dapat menemukan detail aturan untuk UID {{uid}}",
-      "cannot-load-rule-details-for": "Tidak dapat memuat detail aturan untuk UID {{uid}}",
       "configure-datasource": "Konfigurasikan",
       "draft-new-rule": "Buat draf aturan baru",
       "ds-error": {
@@ -2753,6 +2789,9 @@
       "existing-templates-selector-placeholder-choose-notification-template": "Pilih templat pemberitahuan",
       "loading": "Memuat...",
       "template-options": {
+        "ariaLabel": {
+          "select-notification-template": ""
+        },
         "label": {
           "select-notification-template": "Pilih templat pemberitahuan"
         }
@@ -2779,6 +2818,8 @@
     },
     "templates-table": {
       "actions": "Tindakan",
+      "body-delete-template-group": "",
+      "confirmText-yes-delete": "",
       "no-templates-defined": "Tidak ada templat yang ditentukan.",
       "template-group": "Grup templat",
       "title-delete-template-group": "Hapus grup templat"
@@ -2906,6 +2947,11 @@
         "title-delete-contact-point": "Hapus titik kontak"
       }
     },
+    "use-delete-modal": {
+      "modal": {
+        "confirmText-yes-delete": ""
+      }
+    },
     "use-delete-policy-modal": {
       "modal-element": {
         "title-delete-notification-policy": "Hapus kebijakan pemberitahuan"
@@ -3062,7 +3108,8 @@
     "annotation-field-mapper": {
       "annotation": "Anotasi",
       "first-value": "Nilai pertama",
-      "from": ""
+      "from": "",
+      "noOptionsMessage-unknown-field-names": ""
     },
     "empty-state": {
       "button-title": "Tambahkan kueri anotasi",
@@ -3196,7 +3243,7 @@
       "team-ids-github": "Daftar bilangan bulat ID Tim.",
       "team-ids-label": "ID Tim",
       "team-ids-numbers": "ID Tim harus berupa angka.",
-      "team-ids-other": "Daftar string ID Tim.",
+      "team-ids-other": "",
       "team-ids-placeholder": "Masukkan ID Tim dan tekan Enter untuk menambahkan",
       "teams-url-description": "URL yang digunakan untuk kueri ID Tim. Jika tidak diatur, nilai defaultnya adalah /teams.",
       "teams-url-description-oauth": "Jika Anda mengonfigurasi \"{{ teamsURLLabel }}\", Anda juga harus mengonfigurasi \"{{ teamIDsAttributePathLabel }}\".",
@@ -3240,6 +3287,7 @@
       "additional-actions-menu": {
         "label-reset-to-default-values": "Atur ulang ke nilai default"
       },
+      "confirmText-reset": "",
       "disable": "Nonaktifkan",
       "disabling": "Sedang menonaktifkan...",
       "discard": "Buang",
@@ -4162,8 +4210,8 @@
     }
   },
   "dashbaord-scene": {
-    "interval-variable-form": {
-      "description-auto-option": "Menghitung interval secara dinamis dengan membagi rentang waktu dengan jumlah yang ditentukan"
+    "variable-editor-form": {
+      "run-query": ""
     }
   },
   "dashboard": {
@@ -4325,6 +4373,9 @@
     },
     "dash-nav": {
       "on-open-snapshot-original": {
+        "confirmText": {
+          "proceed": ""
+        },
         "title": {
           "proceed-to-external-site": "Lanjutkan ke situs eksternal?"
         }
@@ -4539,6 +4590,13 @@
           "editable": "Dapat diedit",
           "readonly": "Hanya-baca"
         }
+      },
+      "graph_tooltip_options": {
+        "label": {
+          "default": "",
+          "shared-crosshair": "",
+          "shared-tooltip": ""
+        }
       }
     },
     "get-debug-dashboard": {
@@ -4842,6 +4900,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "Anda yakin ingin memulihkan dasbor ke versi {{version}}? Semua perubahan yang belum disimpan akan hilang.",
+      "confirmText-restore-version": "",
       "title-restore-version": "Pulihkan versi"
     },
     "row-options-button": {
@@ -4892,6 +4951,9 @@
         "title-not-unique": "Judul ini tidak unik"
       }
     },
+    "save-dashboard": {
+      "message-dashboard-saved": ""
+    },
     "save-dashboard-as-button": {
       "save-as": "Simpan sebagai"
     },
@@ -4926,6 +4988,7 @@
     "save-dashboard-error-proxy": {
       "body-name-exists": "Dasbor dengan nama yang sama di folder yang dipilih sudah ada.<1></1><2>Apa Anda masih ingin menyimpan dasbor ini?</2>",
       "body-version-mismatch": "Orang lain telah memperbarui dasbor ini<1></1><2>Apa Anda masih ingin menyimpan dasbor ini?</2>",
+      "confirmText-save-and-overwrite": "",
       "title-name-exists": "Konflik",
       "title-version-mismatch": "Konflik"
     },
@@ -5122,7 +5185,9 @@
       "label-apply-transformation-to": "Terapkan transformasi ke"
     },
     "transformation-operation-row": {
+      "body-delete": "",
       "render-actions": {
+        "confirmText-delete": "",
         "title-debug": "Debug",
         "title-disable-transformation": "Nonaktifkan transformasi",
         "title-filter": "Filter",
@@ -5144,10 +5209,14 @@
       "show-images": "Tampilkan gambar",
       "title-add-another-transformation": "Tambah transformasi lain"
     },
+    "un-theme-transformations-editor": {
+      "body-delete-all-transformations": ""
+    },
     "un-themed-transformations-editor": {
       "actions": {
         "add-another-transformation": "Tambah transformasi lain"
       },
+      "confirmText-delete-all": "",
       "delete-all-transformations": "Hapus semua transformasi",
       "title-delete-all-transformations": "Hapus semua transformasi?",
       "tooltip-clear-search": "Hapus pencarian",
@@ -5184,6 +5253,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "Alihkan tombol pemilihan versi {{version}}",
       "date": "Tanggal",
+      "name-latest": "",
       "notes": "Catatan",
       "restore": "Pulihkan",
       "updated-by": "Diperbarui oleh",
@@ -5260,7 +5330,8 @@
       "description-enables-users-custom-values": "Memungkinkan pengguna untuk menambahkan nilai kustom ke daftar",
       "description-provide-dimensions-as-csv-dimension-name-dimension-id": "Berikan dimensi sebagai CSV: {{name}}, {{value}}",
       "label-data-source": "Sumber data",
-      "label-use-static-key-dimensions": "Gunakan dimensi kunci statis"
+      "label-use-static-key-dimensions": "Gunakan dimensi kunci statis",
+      "name-allow-custom-values": ""
     },
     "add-to-dashboard": {
       "message": {
@@ -5333,6 +5404,9 @@
       }
     },
     "config-public-dashboard": {
+      "confirmText": {
+        "revoke-public-url": ""
+      },
       "title": {
         "revoke-public-url": "Cabut URL publik"
       }
@@ -5344,6 +5418,7 @@
     },
     "custom-variable-form": {
       "custom-options": "Opsi kustom",
+      "name-values-separated-comma": "",
       "selection-options": "Opsi pemilihan"
     },
     "dashboard-edit-pane-renderer": {
@@ -5362,6 +5437,12 @@
       "label-type": "Jenis",
       "label-url": "URL",
       "label-with-tags": "Dengan tag",
+      "link-type-options": {
+        "label": {
+          "dashboards": "",
+          "link": ""
+        }
+      },
       "placeholder-open-dashboard": "Buka dasbor"
     },
     "dashboard-link-list": {
@@ -5408,6 +5489,8 @@
       "data-source-options": "Opsi sumber data",
       "description-instance-name-filter": "Filter regex untuk instans sumber data yang akan dipilih dalam daftar nilai variabel. Biarkan kosong untuk semua.",
       "example-instance-name-filter": "Contoh: <codeExample />",
+      "name-instance-name-filter": "",
+      "name-type": "",
       "selection-options": "Opsi pemilihan"
     },
     "default-grid-layout-manager": {
@@ -5453,6 +5536,21 @@
     "empty-transformations-message": {
       "add-transformation": "Tambahkan transformasi"
     },
+    "general-settings-edit-view": {
+      "editable_options": {
+        "label": {
+          "editable": "",
+          "readonly": ""
+        }
+      },
+      "graph_tooltip_options": {
+        "label": {
+          "default": "",
+          "shared-crosshair": "",
+          "shared-tooltip": ""
+        }
+      }
+    },
     "get-edit-options": {
       "title": {
         "column-options": "Opsi kolom",
@@ -5483,7 +5581,8 @@
       "description-provide-dimensions-as-csv-dimension-name-dimension-id": "Berikan dimensi sebagai CSV: {{name}}, {{value}}",
       "group-by-options": "Kelompokkan berdasarkan opsi",
       "label-data-source": "Sumber data",
-      "label-use-static-group-by-dimensions": "Gunakan dimensi grup statis"
+      "label-use-static-group-by-dimensions": "Gunakan dimensi grup statis",
+      "name-allow-custom-values": ""
     },
     "help-wizard": {
       "copy-to-clipboard": "Salin ke papan klip",
@@ -5519,9 +5618,14 @@
       "apply": "Terapkan"
     },
     "interval-variable-form": {
+      "description-auto-option": "",
       "description-calculated-value-below-threshold": "Nilai yang dihitung tidak akan berada di bawah ambang batas ini",
       "description-step-count": "Berapa kali rentang waktu saat ini harus dibagi untuk menghitung nilai",
-      "interval-options": "Opsi interval"
+      "interval-options": "Opsi interval",
+      "name-auto-option": "",
+      "name-min-interval": "",
+      "name-step-count": "",
+      "name-values": ""
     },
     "json-model-edit-view": {
       "cancel-button": {
@@ -5545,6 +5649,9 @@
       "title-name-already-exists": "Nama sudah ada"
     },
     "on-open-snapshot-original-dashboard": {
+      "confirmText": {
+        "proceed": ""
+      },
       "title": {
         "proceed-to-external-site": "Lanjutkan ke situs eksternal?"
       }
@@ -5580,6 +5687,8 @@
     },
     "panel-data-transformations-tab-rendered": {
       "add-another-transformation": "Tambah transformasi lain",
+      "body-delete-all-transformations": "",
+      "confirmText-delete-all": "",
       "delete-all-transformations": "Hapus semua transformasi",
       "title-delete-all-transformations": "Hapus semua transformasi?"
     },
@@ -5633,6 +5742,7 @@
       "description-optional": "Opsional, jika Anda ingin mengekstrak bagian dari nama seri atau segmen node metrik.",
       "label-data-source": "Sumber data",
       "label-target-data-source": "Sumber data target",
+      "name-regex": "",
       "query-options": "Opsi kueri",
       "selection-options": "Opsi pemilihan"
     },
@@ -5647,6 +5757,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "Anda yakin ingin memulihkan dasbor ke versi {{version}}? Semua perubahan yang belum disimpan akan hilang.",
+      "confirmText-restore-version": "",
       "title-restore-version": "Pulihkan versi"
     },
     "save-button": {
@@ -5739,7 +5850,11 @@
     "selection-options-form": {
       "description-enables-multiple-values-selected": "Memungkinkan beberapa nilai untuk dipilih secara bersamaan",
       "description-enables-option-include-variables": "Mengaktifkan opsi untuk menyertakan semua nilai",
-      "description-enables-users-custom-values": "Memungkinkan pengguna untuk menambahkan nilai kustom ke daftar"
+      "description-enables-users-custom-values": "Memungkinkan pengguna untuk menambahkan nilai kustom ke daftar",
+      "name-allow-custom-values": "",
+      "name-custom-all-value": "",
+      "name-include-all-option": "",
+      "name-multi-value": ""
     },
     "share-button": {
       "aria-label-sharedropdownmenu": "Alihkan menu bagikan"
@@ -5759,6 +5874,9 @@
         "copy-to-clipboard-failed": "Gagal menyalin ke papan klip"
       }
     },
+    "text-box-variable": {
+      "name-default-value": ""
+    },
     "text-box-variable-form": {
       "placeholder-default-value-if-any": "(opsional)",
       "text-options": "Opsi teks"
@@ -5782,6 +5900,8 @@
       }
     },
     "unlink-modal": {
+      "body-unlink-panel": "",
+      "confirmText-yes-unlink": "",
       "title-really-unlink-panel": "Anda yakin ingin memutus tautan panel ini?"
     },
     "unsaved-changes-modal": {
@@ -5798,6 +5918,9 @@
         }
       }
     },
+    "use-save-dashboard": {
+      "message-dashboard-saved": ""
+    },
     "variable-check-indicator": {
       "aria-label-variable-referenced-dashboard": "Variabel ini tidak direferensikan oleh variabel atau dasbor apa pun.",
       "aria-label-variable-referenced-other-variables-dashboard": "Variabel ini direferensikan oleh variabel atau dasbor lain.",
@@ -5807,10 +5930,16 @@
     "variable-editor-form": {
       "aria-label-variable-editor-form": "Formulir editor variabel",
       "back-to-list": "Kembali ke daftar",
+      "confirmText": {
+        "delete-variable": ""
+      },
       "delete": "Hapus",
       "description-optional-display-name": "Nama tampilan opsional",
       "description-template-variable-characters": "Nama variabel templat. (Maks. 50 karakter)",
       "general": "Umum",
+      "name-description": "",
+      "name-label": "",
+      "name-name": "",
       "placeholder-descriptive-text": "Teks deskriptif",
       "placeholder-label-name": "Nama label",
       "placeholder-variable-name": "Nama variabel",
@@ -5825,13 +5954,25 @@
       "variable": "Variabel"
     },
     "variable-editor-list-row": {
+      "body-delete-variable": "",
+      "confirmText-delete-variable": "",
       "title-delete-variable": "Hapus variabel",
       "tooltip-duplicate-variable": "Duplikatkan variabel",
       "tooltip-remove-variable": "Hapus variabel"
     },
     "variable-hide-select": {
+      "hide_options": {
+        "label": {
+          "label": "",
+          "nothing": "",
+          "variable": ""
+        }
+      },
       "label": "Sembunyikan"
     },
+    "variable-type-select": {
+      "name-variable-type": ""
+    },
     "variable-usages-button": {
       "title-show-usages": "Menampilkan penggunaan untuk: {{variableId}}",
       "tooltip-show-usages": "Tampilkan penggunaan"
@@ -5858,6 +5999,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "Alihkan tombol pemilihan versi {{version}}",
       "date": "Tanggal",
+      "name-latest": "",
       "notes": "Catatan",
       "restore": "Pulihkan",
       "updated-by": "Diperbarui oleh",
@@ -6245,7 +6387,8 @@
       }
     },
     "color-dimension-editor": {
-      "label-fixed-color": ""
+      "label-fixed-color": "",
+      "noOptionsMessage-no-fields-found": ""
     },
     "file-dropzone-custom-children": {
       "upload": "Unggah"
@@ -6283,6 +6426,7 @@
       },
       "label-limit": "Batas",
       "label-value": "Nilai",
+      "noOptionsMessage-no-fields-found": "",
       "scalar-options": {
         "description-clamped": "",
         "description-mod": "",
@@ -6291,9 +6435,15 @@
       }
     },
     "scale-dimension-editor": {
+      "fixed-value-option": {
+        "label": {
+          "fixed-value": ""
+        }
+      },
       "label-max": "Maksimum",
       "label-min": "Minimum",
-      "label-value": "Nilai"
+      "label-value": "Nilai",
+      "noOptionsMessage-no-fields-found": ""
     },
     "text-dimension-editor": {
       "description-field": "",
@@ -6865,6 +7015,8 @@
       "aria-label-select-service-name-operator": "Pilih operator nama layanan",
       "aria-label-select-span-name": "Pilih nama rentang",
       "aria-label-select-span-name-operator": "Pilih operator nama rentang",
+      "ariaLabel-select-max-span-duration": "",
+      "ariaLabel-select-min-span-duration": "",
       "label-collapse": "Filter Rentang",
       "label-duration": "Durasi",
       "label-service-name": "Nama layanan",
@@ -6935,6 +7087,8 @@
       "split-widen": "Lebarkan panel"
     },
     "trace-page-actions": {
+      "ariaLabel-copy-trace-id": "",
+      "ariaLabel-export-trace": "",
       "give-feedback": "Berikan umpan balik",
       "label-copied": "Disalin!",
       "label-export": "Ekspor",
@@ -7072,6 +7226,7 @@
   },
   "folder-filter": {
     "clear-folder-button": "Hapus folder",
+    "noOptionsMessage-no-folders-found": "",
     "select-aria-label": "Filter folder",
     "select-placeholder": "Filter berdasarkan folder"
   },
@@ -7140,7 +7295,53 @@
     "incomplete-request-error": "Maaf, saya tidak dapat menyelesaikan permintaan Anda. Silakan coba lagi.",
     "send-custom-feedback": "Kirim"
   },
+  "geo": {
+    "get-geometry-field": {
+      "warning-gazetteer-not-found": "",
+      "warning-no-geometry": "",
+      "warning-select-geohash": "",
+      "warning-select-lat-long": "",
+      "warning-select-lookup": "",
+      "warning-unable-to-find": ""
+    },
+    "location-editor": {
+      "geohash-field": {
+        "no-fields-message": ""
+      },
+      "latitude-field": {
+        "no-fields-message": ""
+      },
+      "longitude-field": {
+        "no-fields-message": ""
+      },
+      "lookup-field": {
+        "no-fields-message": ""
+      },
+      "name-gazetteer": "",
+      "name-geohash-field": "",
+      "name-latitude-field": "",
+      "name-location-mode": "",
+      "name-longitude-field": "",
+      "name-lookup-field": ""
+    },
+    "location-more-editor": {
+      "mode-options": {
+        "description-auto": "",
+        "description-coords": "",
+        "description-geohash": "",
+        "description-lookup": "",
+        "label-auto": "",
+        "label-coords": "",
+        "label-geohash": "",
+        "label-lookup": ""
+      }
+    }
+  },
   "geomap": {
+    "category-basemap-layer": "",
+    "category-map-controls": "",
+    "category-map-layers": "",
+    "category-map-view": "",
     "coordinates-map-view-editor": {
       "label-latitude": "Garis Lintang",
       "label-longitude": "Garis Bujur"
@@ -7149,6 +7350,14 @@
       "center": "Pusat:",
       "zoom": "Zoom:"
     },
+    "description-initial-view": "",
+    "description-mouse-wheel-zoom": "",
+    "description-share-view": "",
+    "description-show-attribution": "",
+    "description-show-debug": "",
+    "description-show-measure": "",
+    "description-show-scale": "",
+    "description-show-zoom": "",
     "fit-map-view-editor": {
       "all-layers-editor-fragment": {
         "label-layer": "Layer"
@@ -7171,6 +7380,14 @@
     "geomap-style-rules-editor": {
       "aria-label-add-geomap-style-rule": "Tambahkan aturan gaya geomap"
     },
+    "layer-editor": {
+      "category-base-layer": "",
+      "description-display-tooltip": "",
+      "name-data": "",
+      "name-display-tooltip": "",
+      "name-layer-type": "",
+      "name-opacity": ""
+    },
     "layers-editor": {
       "label-add-layer": "Tambahkan layer",
       "no-layers": "Tidak ada layer?"
@@ -7181,16 +7398,38 @@
       "label-zoom": "Perbesar",
       "use-current-map-settings": "Gunakan pengaturan peta saat ini"
     },
+    "markers-layer": {
+      "description-show-legend": "",
+      "name-show-legend": "",
+      "name-styles": ""
+    },
     "markers-legend": {
       "title-symbol": "Simbol"
     },
     "measure-overlay": {
       "tooltip-show-measure-tools": "Tampilkan alat ukur"
     },
+    "name-initial-view": "",
+    "name-mouse-wheel-zoom": "",
+    "name-share-view": "",
+    "name-show-attribution": "",
+    "name-show-debug": "",
+    "name-show-measure": "",
+    "name-show-scale": "",
+    "name-show-zoom": "",
+    "name-tooltip": "",
+    "photos-layer": {
+      "noFieldsMessage-no-string-fields": ""
+    },
     "plugin": {
       "basemap-layer-configured-server-admin": "Layer peta dasar dikonfigurasi oleh admin server."
     },
     "style-editor": {
+      "horizontal-align-options": {
+        "label-center": "",
+        "label-left": "",
+        "label-right": ""
+      },
       "label-align": "Ratakan",
       "label-baseline": "Baseline",
       "label-color": "Warna",
@@ -7204,7 +7443,14 @@
       "label-symbol-vertical-align": "Penyelarasan vertikal simbol",
       "label-text-label": "Label teks",
       "label-x-offset": "Offset X",
-      "label-y-offset": "Offset Y"
+      "label-y-offset": "Offset Y",
+      "placeholderText-select-symbol": "",
+      "placeholderText-select-symbol-or-add-text": "",
+      "vertical-align-options": {
+        "label-bottom": "",
+        "label-center": "",
+        "label-top": ""
+      }
     },
     "style-rule-editor": {
       "aria-label-comparison-operator": "Operator perbandingan",
@@ -7215,6 +7461,15 @@
       "placeholder-feature-property": "Properti fitur",
       "placeholder-numeric-value": "Nilai numerik",
       "placeholder-value": "nilai"
+    },
+    "tooltip-options": {
+      "description-details": "",
+      "description-none": "",
+      "label-details": "",
+      "label-none": ""
+    },
+    "utils": {
+      "get-next-layer-name": ""
     }
   },
   "get-enterprise": {
@@ -7464,7 +7719,8 @@
       "aria-label-selected-color": "warna {{colorLabel}}"
     },
     "confirm-button": {
-      "cancel": "Batalkan"
+      "cancel": "Batalkan",
+      "confirmText-delete": ""
     },
     "confirm-content": {
       "placeholder": "Ketik \"{{confirmPromptText}}\" untuk mengonfirmasi"
@@ -7646,6 +7902,8 @@
     },
     "panel-chrome": {
       "aria-label-toggle-collapse": "alihkan panel ciutkan",
+      "ariaLabel-panel-loading": "",
+      "ariaLabel-panel-status": "",
       "tooltip-cancel": "Batalkan kueri",
       "tooltip-cancel-loading": "Batalkan kueri",
       "tooltip-stop-streaming": "Hentikan streaming",
@@ -7813,6 +8071,12 @@
       "footer-click-to-action": "Klik untuk {{actionTitle}} ",
       "footer-click-to-navigate": "Klik untuk membuka {{linkTitle}}",
       "timestamp": "Stempel Waktu"
+    },
+    "week-start-picker": {
+      "weekStarts-label-default": "",
+      "weekStarts-label-monday": "",
+      "weekStarts-label-saturday": "",
+      "weekStarts-label-sunday": ""
     }
   },
   "graph": {
@@ -8189,6 +8453,10 @@
     "add-library-panel-modal": {
       "title-create-library-panel": "Buat panel pustaka"
     },
+    "change-library-panel-modal": {
+      "confirmText-change": "",
+      "confirmText-replace": ""
+    },
     "confirm": {
       "delete-panel": "Ingin menghapus panel ini?"
     },
@@ -8630,6 +8898,8 @@
       "updated-on": "Diperbarui pada"
     },
     "snapshot-list-table": {
+      "body-delete": "",
+      "confirmText-delete": "",
       "title-delete": "Hapus"
     },
     "unthemed-dashboard-import": {
@@ -8641,6 +8911,9 @@
       }
     }
   },
+  "metric-select": {
+    "noOptionsMessage-no-options-found": ""
+  },
   "migrate-to-cloud": {
     "build-snapshot": {
       "description": "Alat ini dapat memigrasikan beberapa sumber daya dari instalasi ini ke tumpukan cloud Anda. Untuk memulai, Anda harus membuat snapshot instalasi ini. Membuat snapshot biasanya membutuhkan waktu kurang dari dua menit. Snapshot disimpan di samping instalasi Grafana ini.",
@@ -9476,6 +9749,7 @@
     }
   },
   "org-picker": {
+    "noOptionsMessage-no-organizations-found": "",
     "select-placeholder": "Pilih organisasi"
   },
   "page": {
@@ -9698,6 +9972,7 @@
         "permission": "Anda tidak memiliki izin untuk melihat halaman ini.",
         "title-access-denied": "Akses ditolak"
       },
+      "error-loading-plugin": "",
       "no-root-app-page-component-found": "Tidak ada komponen halaman aplikasi root yang ditemukan"
     },
     "browse": {
@@ -9741,8 +10016,7 @@
         "update-status-text": "plugin diperbarui"
       },
       "versions": {
-        "confirmation-text-1": "Apa Anda yakin ingin menurunkan ke versi",
-        "confirmation-text-2": "Anda biasanya tidak boleh melakukan ini",
+        "confirmation-text": "",
         "downgrade-confirm": "Turunkan",
         "downgrade-title": "Turunkan versi plugin"
       }
@@ -9796,6 +10070,10 @@
     "empty-state": {
       "message": "Tidak ada plugin yang ditemukan"
     },
+    "extensions": {
+      "extension-error-alert-description": "",
+      "extension-error-alert-title": ""
+    },
     "extensions-log-data-source": {
       "message": {
         "ok": "OK"
@@ -9829,7 +10107,11 @@
       "updating": "Memperbarui"
     },
     "install-controls-button": {
-      "title-uninstall-modal": "Hapus instalasi {{plugin}}"
+      "title-uninstall-modal": "Hapus instalasi {{plugin}}",
+      "uninstall-controls": {
+        "body-uninstall-plugin": "",
+        "confirmText-confirm": ""
+      }
     },
     "install-controls-warning": {
       "body-not-published": "Plugin ini tidak dipublikasikan ke <2>grafana.com/plugins</2> dan tidak dapat dikelola melalui katalog.",
@@ -10860,6 +11142,7 @@
     }
   },
   "service-account-picker": {
+    "noOptionsMessage-no-service-accounts-found": "",
     "select-aria-label": "Pemilih akun layanan",
     "select-placeholder": "Mulai mengetik untuk mencari akun layanan"
   },
@@ -10905,6 +11188,10 @@
     },
     "service-account-page-unconnected": {
       "add-service-account-token": "Tambahkan token akun layanan",
+      "body-delete-service-account": "",
+      "body-disable-service-account": "",
+      "confirmText-delete-service-account": "",
+      "confirmText-disable-service-account": "",
       "delete-service-account": "Hapus akun layanan",
       "disable-service-account": "Nonaktifkan akun layanan",
       "enable-service-account": "Aktifkan akun layanan",
@@ -10931,6 +11218,7 @@
       "used-by": "Digunakan oleh"
     },
     "service-account-profile-row": {
+      "confirmText-save": "",
       "edit": "Edit"
     },
     "service-account-role-row": {
@@ -10944,10 +11232,15 @@
     },
     "service-accounts-list-page-unconnected": {
       "add-service-account": "Tambahkan akun layanan",
+      "body-delete-with-tokens": "",
+      "body-disable-service-account": "",
+      "confirmText-delete": "",
+      "confirmText-disable-service-account": "",
       "placeholder-search-service-account-by-name": "Cari akun layanan berdasarkan nama",
       "sub-title": "Akun layanan dan tokennya dapat digunakan untuk mengautentikasi API Grafana. Cari tahu selengkapnya di <2>dokumentasi kami.</2>",
       "title-delete-service-account": "Hapus akun layanan",
-      "title-disable-service-account": "Nonaktifkan akun layanan"
+      "title-disable-service-account": "Nonaktifkan akun layanan",
+      "body-delete_other": ""
     },
     "token-expiration": {
       "content-this-token-has-expired": "Token ini telah kedaluwarsa",
@@ -11483,6 +11776,7 @@
     "tag-option-label": "Opsi tag"
   },
   "team-picker": {
+    "noOptionsMessage-no-teams-found": "",
     "select-aria-label": "Pemilih tim",
     "select-placeholder": "Pilih tim"
   },
@@ -11808,6 +12102,7 @@
     "convert-field-type-transformer-editor": {
       "aria-label-add-a-convert-field-type-transformer": "Tambahkan transformer jenis bidang konversi",
       "aria-label-remove-convert-field-type-transformer": "Hapus transformer jenis bidang konversi",
+      "convert-field-type": "",
       "label": {
         "browser": "Browser",
         "utc": "UTC"
@@ -11850,6 +12145,11 @@
       "remove-enum-row-tooltip-delete": "Hapus"
     },
     "extract-fields-transformer-editor": {
+      "field-name-picker-settings": {
+        "placeholderText": {
+          "select-field": ""
+        }
+      },
       "label-delimiter": "Delimiter",
       "label-format": "Format",
       "label-keep-time": "Pertahankan waktu",
@@ -11863,6 +12163,14 @@
       "aria-label-threshold-color": "Warna ambang batas"
     },
     "field-lookup-transformer-editor": {
+      "field-name-picker-settings": {
+        "noFieldsMessage": {
+          "no-text-fields-found": ""
+        },
+        "placeholderText": {
+          "select-text-field": ""
+        }
+      },
       "label-field": "Bidang",
       "label-lookup": "Cari"
     },
@@ -11888,10 +12196,30 @@
     },
     "filter-by-value-transformer-editor": {
       "add-condition": "Tambah ketentuan",
+      "filter-match": {
+        "label": {
+          "match-all": "",
+          "match-any": ""
+        }
+      },
+      "filter-types": {
+        "label": {
+          "exclude": "",
+          "include": ""
+        }
+      },
       "label-conditions": "Syarat",
       "label-filter-type": "Jenis filter"
     },
     "format-string-transfomer-editor": {
+      "field-name-picker-settings": {
+        "noFieldsMessage": {
+          "no-text-fields-found": ""
+        },
+        "placeholderText": {
+          "select-text-field": ""
+        }
+      },
       "label-field": "Bidang",
       "label-format": "Format",
       "label-substring-range": "Rentang substring"
@@ -12202,6 +12530,7 @@
     "title": "Organisasi"
   },
   "user-picker": {
+    "noOptionsMessage-no-users-found": "",
     "select-aria-label": "Pemilih pengguna",
     "select-placeholder": "Mulai mengetik untuk mencari pengguna"
   },
@@ -12287,6 +12616,8 @@
       }
     },
     "confirm-delete-modal": {
+      "body-delete-variable": "",
+      "confirmText-delete": "",
       "title-delete-variable": "Hapus variabel"
     },
     "create-ad-hoc-variable-adapter": {
@@ -12335,9 +12666,24 @@
       "label-refresh": "Muat ulang"
     },
     "query-variable-sort-select": {
-      "description-values-variable": "Cara mengurutkan nilai variabel ini"
+      "description-values-variable": "Cara mengurutkan nilai variabel ini",
+      "name-sort": "",
+      "sort_options": {
+        "label": {
+          "alphabetical-asc": "",
+          "alphabetical-caseinsensitive-asc": "",
+          "alphabetical-caseinsensitive-desc": "",
+          "alphabetical-desc": "",
+          "disabled": "",
+          "natural-asc": "",
+          "natural-desc": "",
+          "numerical-asc": "",
+          "numerical-desc": ""
+        }
+      }
     },
     "text-box-variable-editor": {
+      "name-default-value": "",
       "placeholder-default-value-if-any": "nilai default, jika ada",
       "text-options": "Opsi teks"
     },
@@ -12366,6 +12712,8 @@
       "description-optional-display-name": "Nama tampilan opsional",
       "description-template-variable-characters": "Nama variabel templat. (Maks. 50 karakter)",
       "general": "Umum",
+      "name-label": "",
+      "name-name": "",
       "placeholder-descriptive-text": "Teks deskriptif",
       "placeholder-label-name": "Nama label",
       "placeholder-variable-name": "Nama variabel",
@@ -12380,9 +12728,15 @@
       "tooltip-duplicate-variable": "Duplikatkan variabel",
       "tooltip-remove-variable": "Hapus variabel"
     },
+    "variable-editor-un-connected": {
+      "name-description": ""
+    },
     "variable-options": {
       "aria-label-toggle-all-values": "Alihkan tombol semua nilai"
     },
+    "variable-type-select": {
+      "name-select-variable-type": ""
+    },
     "variable-usages-button": {
       "tooltip-show-usages": "Tampilkan penggunaan"
     },
diff --git a/public/locales/it-IT/grafana.json b/public/locales/it-IT/grafana.json
index 483ac13ebff..836d52d7fbb 100644
--- a/public/locales/it-IT/grafana.json
+++ b/public/locales/it-IT/grafana.json
@@ -84,6 +84,7 @@
     "admin-feature-toggles-table": {
       "confirm-modal-body-1": "Alcune funzionalità sono stabili (GA) e attive per impostazione predefinita, mentre altre sono ancora in fase beta preliminare e disponibili su richiesta in anteprima.",
       "confirm-modal-body-2": "Si consiglia di comprendere le implicazioni di ogni modifica delle funzionalità prima di applicarle.",
+      "confirmText-save-changes": "",
       "get-stage-cell": {
         "beta": "Beta",
         "content-general-availability": "Disponibilità generale",
@@ -96,14 +97,21 @@
     },
     "admin-orgs-table": {
       "aria-label-delete-org": "Elimina org",
+      "confirmText-delete": "",
       "title-delete": "Elimina"
     },
     "anon-users": {
       "not-found": "Nessun utente anonimo trovato."
     },
     "base-user-sessions": {
+      "body-force-logout-from-all-devices": "",
+      "confirmText-confirm-logout": "",
+      "confirmText-force-logout": "",
       "title-force-logout-from-all-devices": "Forza la disconnessione da tutti i dispositivi"
     },
+    "change-org-button": {
+      "confirmText-save": ""
+    },
     "edit-org": {
       "access-denied": "Non hai l'autorizzazione per vedere gli utenti in questa organizzazione. Per aggiornare questa organizzazione, contatta l'amministratore del server.",
       "heading": "Modifica organizzazione",
@@ -208,9 +216,11 @@
       "not-editable": "Il ruolo di questo utente non è modificabile perché è sincronizzato dal provider di autenticazione. Fai riferimento ai <1>documenti di autenticazione Grafana</1> per i dettagli."
     },
     "org-users-table": {
+      "body-delete": "",
       "columns": {
         "aria-label-role": "Ruolo"
       },
+      "confirmText-delete": "",
       "delete-aria-label": "Elimina utente: {{name}}",
       "title-delete": "Elimina"
     },
@@ -241,6 +251,9 @@
     "settings": {
       "info-description": "Queste impostazioni di sistema sono definite in grafana.ini o custom.ini (o sovrascritte nelle variabili ENV). Per modificarle, al momento è necessario riavviare Grafana."
     },
+    "un-themed-org-row": {
+      "confirmText-confirm-removal": ""
+    },
     "upgrade-info": {
       "title": "Licenza Enterprise"
     },
@@ -293,12 +306,17 @@
     },
     "user-permissions": {
       "change-button": "Modifica",
+      "confirmText-change": "",
       "grafana-admin-key": "Amministratore Grafana",
       "grafana-admin-no": "No",
       "grafana-admin-yes": "Sì",
       "title": "Autorizzazioni"
     },
     "user-profile": {
+      "body-delete": "",
+      "body-disable": "",
+      "confirmText-delete-user": "",
+      "confirmText-disable-user": "",
       "delete-button": "Elimina utente",
       "disable-button": "Disabilita utente",
       "edit-button": "Modifica",
@@ -312,6 +330,9 @@
       "title-delete-user": "Elimina utente",
       "title-disable-user": "Disabilita utente"
     },
+    "user-profile-row": {
+      "confirmText-save": ""
+    },
     "user-sessions": {
       "browser-column": "Browser e sistema operativo",
       "force-logout-all-button": "Forza la disconnessione da tutti i dispositivi",
@@ -461,6 +482,9 @@
       "label-muting-grouping-and-timings-optional": "Disattivazione audio, raggruppamento e tempistiche (opzionale)",
       "title-muting-grouping-and-timings": "Disattivazione audio, raggruppamento e orari"
     },
+    "alert-manager-picker": {
+      "noOptionsMessage-no-datasources-found": ""
+    },
     "alert-menu": {
       "copy-link": "Copia link",
       "duplicate": "Duplica",
@@ -550,6 +574,7 @@
       "view-configuration": "Visualizza configurazione"
     },
     "alertmanager-config": {
+      "confirmText-yes-reset-configuration": "",
       "gma-manual-configuration-description": "La configurazione interna di Grafana Alertmanager non può essere modificata manualmente. Per modificare questa configurazione, modifica le singole risorse tramite l'interfaccia utente.",
       "gma-manual-configuration-is-not-supported": "Modifiche alla configurazione manuale non supportate",
       "message": {
@@ -564,11 +589,13 @@
       "title-resetting-alertmanager-configuration": "Ripristino della configurazione di Alertmanager"
     },
     "alertmanager-configuration-version-manager": {
+      "body-restore-configuration-version-unsaved-changes": "",
       "columns": {
         "compare": "Confronta",
         "restore": "Ripristina",
         "text-latest": "Più recente"
       },
+      "confirmText-yes-restore-configuration": "",
       "loading": "Caricamento in corso...",
       "no-previous-configurations": "Nessuna configurazione precedente",
       "this-might-take-a-while": "Potrebbe volerci un po' di tempo...",
@@ -848,8 +875,10 @@
     },
     "contact-point-header": {
       "aria-label-more-actions": "Altre azioni per il punto di contatto \"{{contactPointName}}\"",
+      "ariaLabel-delete": "",
       "button-edit": "Modifica",
       "button-view": "Visualizza",
+      "export-ariaLabel-export": "",
       "export-label-export": "Esporta",
       "label-delete": "Elimina",
       "label-manage-permissions": "Gestisci autorizzazioni",
@@ -1384,6 +1413,7 @@
       "label-disable-resolved-message": "Disabilita messaggio risolto"
     },
     "grafana-evaluation-behavior-step": {
+      "loadingMessage-loading-groups": "",
       "message": {
         "must-be-a-positive-integer": "",
         "must-enter-a-group-name": ""
@@ -1842,7 +1872,11 @@
             "other-data-sources": ""
           }
         }
-      }
+      },
+      "noOptionsMessage-no-datasources-found": ""
+    },
+    "mute-timing-actions-button": {
+      "body-delete-mute-timing": ""
     },
     "mute-timing-actions-buttons": {
       "text-disabled": "Disabilitato",
@@ -2093,9 +2127,11 @@
       "update-errors": {
         "conflict": "L'albero di accesso alle notifiche è stato aggiornato da un altro utente.",
         "error-code": "Messaggio di errore: \"{{error}}\"",
-        "fallback": "Si è verificato un errore durante l'aggiornamento dei criteri di notifica.",
+        "routes": {
+          "conflictingMatchers": ""
+        },
         "suffix": "Aggiorna la pagina e riprova.",
-        "title": "Errore durante il salvataggio dei criteri di notifica"
+        "title": ""
       },
       "n-more-policies_one": "{{count}} criterio aggiuntivo",
       "n-more-policies_other": "{{count}} criteri aggiuntivi"
@@ -2151,6 +2187,7 @@
     "query-and-expressions-step": {
       "add-query": "Aggiungi query",
       "body-queries-expressions-configured": "Crea almeno una query o un'espressione su cui ricevere un avviso",
+      "confirmText-deactivate": "",
       "expressions": "Espressioni",
       "loading-data-sources": "Caricamento delle origini dei dati in corso...",
       "manipulate-returned-queries-other-operations": "Modifica i dati che trovi nelle query usando operazioni matematiche e di altro tipo.",
@@ -2218,6 +2255,7 @@
     "redirect-to-clone-rule": {
       "body-evaluation-group": "Sarà necessario impostare un nuovo gruppo di valutazione per la regola copiata perché quella originale è stata sottoposta a provisioning e non può essere utilizzata per le regole create nell'interfaccia utente.",
       "body-not-provisioned": "La nuova regola <1>non</1> sarà contrassegnata come regola con provisioning.",
+      "confirmText-copy": "",
       "title-copy-provisioned-alert-rule": "Copia la regola di avviso fornita"
     },
     "redirect-to-rule-viewer": {
@@ -2415,8 +2453,6 @@
       "title-inspect-alert-rule": "Ispeziona la regola di avviso"
     },
     "rule-list": {
-      "cannot-find-rule-details-for": "Impossibile trovare i dettagli della regola per l'UID {{uid}}",
-      "cannot-load-rule-details-for": "Impossibile caricare i dettagli della regola per l'UID {{uid}}",
       "configure-datasource": "Configura",
       "draft-new-rule": "Scrivi una nuova regola",
       "ds-error": {
@@ -2766,6 +2802,9 @@
       "existing-templates-selector-placeholder-choose-notification-template": "Scegli il modello di notifica",
       "loading": "Caricamento in corso...",
       "template-options": {
+        "ariaLabel": {
+          "select-notification-template": ""
+        },
         "label": {
           "select-notification-template": ""
         }
@@ -2792,6 +2831,8 @@
     },
     "templates-table": {
       "actions": "Azioni",
+      "body-delete-template-group": "",
+      "confirmText-yes-delete": "",
       "no-templates-defined": "Nessun modello definito.",
       "template-group": "Gruppo modelli",
       "title-delete-template-group": "Elimina gruppo di modelli"
@@ -2919,6 +2960,11 @@
         "title-delete-contact-point": "Elimina punto di contatto"
       }
     },
+    "use-delete-modal": {
+      "modal": {
+        "confirmText-yes-delete": ""
+      }
+    },
     "use-delete-policy-modal": {
       "modal-element": {
         "title-delete-notification-policy": "Elimina criterio di notifica"
@@ -3075,7 +3121,8 @@
     "annotation-field-mapper": {
       "annotation": "Annotazioni",
       "first-value": "Primo valore",
-      "from": ""
+      "from": "",
+      "noOptionsMessage-unknown-field-names": ""
     },
     "empty-state": {
       "button-title": "Aggiungi query di annotazione",
@@ -3209,7 +3256,7 @@
       "team-ids-github": "Elenco intero di ID team.",
       "team-ids-label": "ID team",
       "team-ids-numbers": "Gli ID dei team devono essere numeri.",
-      "team-ids-other": "Elenco stringa di ID team.",
+      "team-ids-other": "",
       "team-ids-placeholder": "Inserisci gli ID dei team e premi Invio per aggiungerli",
       "teams-url-description": "L'URL utilizzato per eseguire query per gli ID dei team. Se non impostato, il valore predefinito è /teams.",
       "teams-url-description-oauth": "Se configuri \"{{ teamsURLLabel }}\", devi configurare anche \"{{ teamIDsAttributePathLabel }}\".",
@@ -3253,6 +3300,7 @@
       "additional-actions-menu": {
         "label-reset-to-default-values": "Ripristina valori predefiniti"
       },
+      "confirmText-reset": "",
       "disable": "Disabilita",
       "disabling": "Disabilitazione in corso...",
       "discard": "Annulla",
@@ -4180,8 +4228,8 @@
     }
   },
   "dashbaord-scene": {
-    "interval-variable-form": {
-      "description-auto-option": "Calcola dinamicamente l'intervallo dividendo l'intervallo di tempo per il conteggio specificato"
+    "variable-editor-form": {
+      "run-query": ""
     }
   },
   "dashboard": {
@@ -4343,6 +4391,9 @@
     },
     "dash-nav": {
       "on-open-snapshot-original": {
+        "confirmText": {
+          "proceed": ""
+        },
         "title": {
           "proceed-to-external-site": ""
         }
@@ -4557,6 +4608,13 @@
           "editable": "Modificabile",
           "readonly": ""
         }
+      },
+      "graph_tooltip_options": {
+        "label": {
+          "default": "",
+          "shared-crosshair": "",
+          "shared-tooltip": ""
+        }
       }
     },
     "get-debug-dashboard": {
@@ -4861,6 +4919,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "Desideri davvero ripristinare la dashboard alla versione {{version}}? Tutte le modifiche non salvate andranno perse.",
+      "confirmText-restore-version": "",
       "title-restore-version": "Ripristina versione"
     },
     "row-options-button": {
@@ -4911,6 +4970,9 @@
         "title-not-unique": "Questo titolo non è univoco"
       }
     },
+    "save-dashboard": {
+      "message-dashboard-saved": ""
+    },
     "save-dashboard-as-button": {
       "save-as": "Salva con nome"
     },
@@ -4945,6 +5007,7 @@
     "save-dashboard-error-proxy": {
       "body-name-exists": "Esiste già una dashboard con lo stesso nome nella cartella selezionata.<1></1><2>Desideri comunque salvare questa dashboard?</2>",
       "body-version-mismatch": "Qualcun altro ha aggiornato questa dashboard<1></1><2>Desideri comunque salvare questa dashboard?</2>",
+      "confirmText-save-and-overwrite": "",
       "title-name-exists": "Conflitto",
       "title-version-mismatch": "Conflitto"
     },
@@ -5141,7 +5204,9 @@
       "label-apply-transformation-to": "Applica la trasformazione a"
     },
     "transformation-operation-row": {
+      "body-delete": "",
       "render-actions": {
+        "confirmText-delete": "",
         "title-debug": "Esegui il debug",
         "title-disable-transformation": "Disabilita trasformazione",
         "title-filter": "Filtro",
@@ -5163,10 +5228,14 @@
       "show-images": "Mostra immagini",
       "title-add-another-transformation": "Aggiungi un'altra trasformazione"
     },
+    "un-theme-transformations-editor": {
+      "body-delete-all-transformations": ""
+    },
     "un-themed-transformations-editor": {
       "actions": {
         "add-another-transformation": "Aggiungi un'altra trasformazione"
       },
+      "confirmText-delete-all": "",
       "delete-all-transformations": "Elimina tutte le trasformazioni",
       "title-delete-all-transformations": "Eliminare tutte le trasformazioni?",
       "tooltip-clear-search": "Azzera ricerca",
@@ -5203,6 +5272,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "Toggle di selezione della versione {{version}}",
       "date": "Data",
+      "name-latest": "",
       "notes": "Note",
       "restore": "Ripristina",
       "updated-by": "Aggiornato da",
@@ -5279,7 +5349,8 @@
       "description-enables-users-custom-values": "Consente agli utenti di aggiungere valori personalizzati all'elenco",
       "description-provide-dimensions-as-csv-dimension-name-dimension-id": "Fornisci le dimensioni come CSV: {{name}}, {{value}}",
       "label-data-source": "Sorgente dati",
-      "label-use-static-key-dimensions": "Usa dimensioni chiave statiche"
+      "label-use-static-key-dimensions": "Usa dimensioni chiave statiche",
+      "name-allow-custom-values": ""
     },
     "add-to-dashboard": {
       "message": {
@@ -5352,6 +5423,9 @@
       }
     },
     "config-public-dashboard": {
+      "confirmText": {
+        "revoke-public-url": ""
+      },
       "title": {
         "revoke-public-url": "Revoca URL pubblico"
       }
@@ -5363,6 +5437,7 @@
     },
     "custom-variable-form": {
       "custom-options": "Opzioni personalizzate",
+      "name-values-separated-comma": "",
       "selection-options": "Seleziona opzioni"
     },
     "dashboard-edit-pane-renderer": {
@@ -5381,6 +5456,12 @@
       "label-type": "Tipo",
       "label-url": "URL",
       "label-with-tags": "Con tag",
+      "link-type-options": {
+        "label": {
+          "dashboards": "",
+          "link": ""
+        }
+      },
       "placeholder-open-dashboard": "Apri dashboard"
     },
     "dashboard-link-list": {
@@ -5427,6 +5508,8 @@
       "data-source-options": "Opzioni dell'origine dei dati",
       "description-instance-name-filter": "Filtro Regex per le istanze di origine dei dati tra cui scegliere nell'elenco dei valori delle variabili. Lascia vuoto per tutti.",
       "example-instance-name-filter": "Esempio: <codeExample />",
+      "name-instance-name-filter": "",
+      "name-type": "",
       "selection-options": "Seleziona opzioni"
     },
     "default-grid-layout-manager": {
@@ -5472,6 +5555,21 @@
     "empty-transformations-message": {
       "add-transformation": "Aggiungi trasformazione"
     },
+    "general-settings-edit-view": {
+      "editable_options": {
+        "label": {
+          "editable": "",
+          "readonly": ""
+        }
+      },
+      "graph_tooltip_options": {
+        "label": {
+          "default": "",
+          "shared-crosshair": "",
+          "shared-tooltip": ""
+        }
+      }
+    },
     "get-edit-options": {
       "title": {
         "column-options": "",
@@ -5502,7 +5600,8 @@
       "description-provide-dimensions-as-csv-dimension-name-dimension-id": "Fornisci le dimensioni come CSV: {{name}}, {{value}}",
       "group-by-options": "Raggruppa per opzioni",
       "label-data-source": "Sorgente dati",
-      "label-use-static-group-by-dimensions": "Usa dimensioni di gruppo statiche"
+      "label-use-static-group-by-dimensions": "Usa dimensioni di gruppo statiche",
+      "name-allow-custom-values": ""
     },
     "help-wizard": {
       "copy-to-clipboard": "Copia negli appunti",
@@ -5538,9 +5637,14 @@
       "apply": "Applica"
     },
     "interval-variable-form": {
+      "description-auto-option": "",
       "description-calculated-value-below-threshold": "Il valore calcolato non andrà al di sotto di questa soglia",
       "description-step-count": "Quante volte deve essere diviso l'intervallo di tempo corrente per calcolare il valore",
-      "interval-options": "Opzioni di intervallo"
+      "interval-options": "Opzioni di intervallo",
+      "name-auto-option": "",
+      "name-min-interval": "",
+      "name-step-count": "",
+      "name-values": ""
     },
     "json-model-edit-view": {
       "cancel-button": {
@@ -5565,6 +5669,9 @@
       "title-name-already-exists": "Nome già in uso"
     },
     "on-open-snapshot-original-dashboard": {
+      "confirmText": {
+        "proceed": ""
+      },
       "title": {
         "proceed-to-external-site": ""
       }
@@ -5600,6 +5707,8 @@
     },
     "panel-data-transformations-tab-rendered": {
       "add-another-transformation": "Aggiungi un'altra trasformazione",
+      "body-delete-all-transformations": "",
+      "confirmText-delete-all": "",
       "delete-all-transformations": "Elimina tutte le trasformazioni",
       "title-delete-all-transformations": "Eliminare tutte le trasformazioni?"
     },
@@ -5653,6 +5762,7 @@
       "description-optional": "Facoltativo, se desideri estrarre parte di un nome di serie o di un segmento di nodo della metrica.",
       "label-data-source": "Sorgente dati",
       "label-target-data-source": "Origine dati di destinazione",
+      "name-regex": "",
       "query-options": "Opzioni query",
       "selection-options": "Seleziona opzioni"
     },
@@ -5667,6 +5777,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "Desideri davvero ripristinare la dashboard alla versione {{version}}? Tutte le modifiche non salvate andranno perse.",
+      "confirmText-restore-version": "",
       "title-restore-version": "Ripristina versione"
     },
     "save-button": {
@@ -5760,7 +5871,11 @@
     "selection-options-form": {
       "description-enables-multiple-values-selected": "Consente di selezionare più valori contemporaneamente",
       "description-enables-option-include-variables": "Abilita un'opzione per includere tutti i valori",
-      "description-enables-users-custom-values": "Consente agli utenti di aggiungere valori personalizzati all'elenco"
+      "description-enables-users-custom-values": "Consente agli utenti di aggiungere valori personalizzati all'elenco",
+      "name-allow-custom-values": "",
+      "name-custom-all-value": "",
+      "name-include-all-option": "",
+      "name-multi-value": ""
     },
     "share-button": {
       "aria-label-sharedropdownmenu": "Attiva/disattiva il menu di condivisione"
@@ -5780,6 +5895,9 @@
         "copy-to-clipboard-failed": ""
       }
     },
+    "text-box-variable": {
+      "name-default-value": ""
+    },
     "text-box-variable-form": {
       "placeholder-default-value-if-any": "(opzionale)",
       "text-options": "Opzioni testo"
@@ -5803,6 +5921,8 @@
       }
     },
     "unlink-modal": {
+      "body-unlink-panel": "",
+      "confirmText-yes-unlink": "",
       "title-really-unlink-panel": "Desideri davvero scollegare questo pannello?"
     },
     "unsaved-changes-modal": {
@@ -5819,6 +5939,9 @@
         }
       }
     },
+    "use-save-dashboard": {
+      "message-dashboard-saved": ""
+    },
     "variable-check-indicator": {
       "aria-label-variable-referenced-dashboard": "Questa variabile non è referenziata da nessuna variabile o dashboard.",
       "aria-label-variable-referenced-other-variables-dashboard": "Questa variabile è referenziata da altre variabili o dashboard.",
@@ -5828,10 +5951,16 @@
     "variable-editor-form": {
       "aria-label-variable-editor-form": "Modulo di modifica delle variabili",
       "back-to-list": "Torna all'elenco",
+      "confirmText": {
+        "delete-variable": ""
+      },
       "delete": "Elimina",
       "description-optional-display-name": "Nome visualizzato facoltativo",
       "description-template-variable-characters": "Il nome della variabile del modello. (Massimo 50 caratteri)",
       "general": "Generale",
+      "name-description": "",
+      "name-label": "",
+      "name-name": "",
       "placeholder-descriptive-text": "Testo descrittivo",
       "placeholder-label-name": "Nome etichetta",
       "placeholder-variable-name": "Nome variabile",
@@ -5846,13 +5975,25 @@
       "variable": "Variabile"
     },
     "variable-editor-list-row": {
+      "body-delete-variable": "",
+      "confirmText-delete-variable": "",
       "title-delete-variable": "Elimina variabile",
       "tooltip-duplicate-variable": "Duplica variabile",
       "tooltip-remove-variable": "Rimuovi variabile"
     },
     "variable-hide-select": {
+      "hide_options": {
+        "label": {
+          "label": "",
+          "nothing": "",
+          "variable": ""
+        }
+      },
       "label": "Nascondi"
     },
+    "variable-type-select": {
+      "name-variable-type": ""
+    },
     "variable-usages-button": {
       "title-show-usages": "Mostra utilizzi per: {{variableId}}",
       "tooltip-show-usages": "Mostra utilizzi"
@@ -5879,6 +6020,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "Toggle di selezione della versione {{version}}",
       "date": "Data",
+      "name-latest": "",
       "notes": "Note",
       "restore": "Ripristina",
       "updated-by": "Aggiornato da",
@@ -6266,7 +6408,8 @@
       }
     },
     "color-dimension-editor": {
-      "label-fixed-color": ""
+      "label-fixed-color": "",
+      "noOptionsMessage-no-fields-found": ""
     },
     "file-dropzone-custom-children": {
       "upload": "Carica"
@@ -6304,6 +6447,7 @@
       },
       "label-limit": "Limite",
       "label-value": "Valore",
+      "noOptionsMessage-no-fields-found": "",
       "scalar-options": {
         "description-clamped": "",
         "description-mod": "",
@@ -6312,9 +6456,15 @@
       }
     },
     "scale-dimension-editor": {
+      "fixed-value-option": {
+        "label": {
+          "fixed-value": ""
+        }
+      },
       "label-max": "Max",
       "label-min": "Min",
-      "label-value": "Valore"
+      "label-value": "Valore",
+      "noOptionsMessage-no-fields-found": ""
     },
     "text-dimension-editor": {
       "description-field": "",
@@ -6886,6 +7036,8 @@
       "aria-label-select-service-name-operator": "Seleziona operatore nome servizio",
       "aria-label-select-span-name": "Seleziona nome intervallo",
       "aria-label-select-span-name-operator": "Seleziona l'operatore del nome dell'intervallo",
+      "ariaLabel-select-max-span-duration": "",
+      "ariaLabel-select-min-span-duration": "",
       "label-collapse": "Filtri intervallo",
       "label-duration": "Durata",
       "label-service-name": "Nome del servizio",
@@ -6956,6 +7108,8 @@
       "split-widen": "Allarga riquadro"
     },
     "trace-page-actions": {
+      "ariaLabel-copy-trace-id": "",
+      "ariaLabel-export-trace": "",
       "give-feedback": "Lascia un feedback",
       "label-copied": "Copiato!",
       "label-export": "Esporta",
@@ -7093,6 +7247,7 @@
   },
   "folder-filter": {
     "clear-folder-button": "Cancella cartelle",
+    "noOptionsMessage-no-folders-found": "",
     "select-aria-label": "Filtro cartelle",
     "select-placeholder": "Filtra per cartella"
   },
@@ -7161,7 +7316,53 @@
     "incomplete-request-error": "Siamo spiacenti, non è stato possibile completare la richiesta. Riprova.",
     "send-custom-feedback": "Invia"
   },
+  "geo": {
+    "get-geometry-field": {
+      "warning-gazetteer-not-found": "",
+      "warning-no-geometry": "",
+      "warning-select-geohash": "",
+      "warning-select-lat-long": "",
+      "warning-select-lookup": "",
+      "warning-unable-to-find": ""
+    },
+    "location-editor": {
+      "geohash-field": {
+        "no-fields-message": ""
+      },
+      "latitude-field": {
+        "no-fields-message": ""
+      },
+      "longitude-field": {
+        "no-fields-message": ""
+      },
+      "lookup-field": {
+        "no-fields-message": ""
+      },
+      "name-gazetteer": "",
+      "name-geohash-field": "",
+      "name-latitude-field": "",
+      "name-location-mode": "",
+      "name-longitude-field": "",
+      "name-lookup-field": ""
+    },
+    "location-more-editor": {
+      "mode-options": {
+        "description-auto": "",
+        "description-coords": "",
+        "description-geohash": "",
+        "description-lookup": "",
+        "label-auto": "",
+        "label-coords": "",
+        "label-geohash": "",
+        "label-lookup": ""
+      }
+    }
+  },
   "geomap": {
+    "category-basemap-layer": "",
+    "category-map-controls": "",
+    "category-map-layers": "",
+    "category-map-view": "",
     "coordinates-map-view-editor": {
       "label-latitude": "",
       "label-longitude": ""
@@ -7170,6 +7371,14 @@
       "center": "",
       "zoom": ""
     },
+    "description-initial-view": "",
+    "description-mouse-wheel-zoom": "",
+    "description-share-view": "",
+    "description-show-attribution": "",
+    "description-show-debug": "",
+    "description-show-measure": "",
+    "description-show-scale": "",
+    "description-show-zoom": "",
     "fit-map-view-editor": {
       "all-layers-editor-fragment": {
         "label-layer": ""
@@ -7192,6 +7401,14 @@
     "geomap-style-rules-editor": {
       "aria-label-add-geomap-style-rule": ""
     },
+    "layer-editor": {
+      "category-base-layer": "",
+      "description-display-tooltip": "",
+      "name-data": "",
+      "name-display-tooltip": "",
+      "name-layer-type": "",
+      "name-opacity": ""
+    },
     "layers-editor": {
       "label-add-layer": "",
       "no-layers": ""
@@ -7202,16 +7419,38 @@
       "label-zoom": "Zoom",
       "use-current-map-settings": ""
     },
+    "markers-layer": {
+      "description-show-legend": "",
+      "name-show-legend": "",
+      "name-styles": ""
+    },
     "markers-legend": {
       "title-symbol": "Simbolo"
     },
     "measure-overlay": {
       "tooltip-show-measure-tools": ""
     },
+    "name-initial-view": "",
+    "name-mouse-wheel-zoom": "",
+    "name-share-view": "",
+    "name-show-attribution": "",
+    "name-show-debug": "",
+    "name-show-measure": "",
+    "name-show-scale": "",
+    "name-show-zoom": "",
+    "name-tooltip": "",
+    "photos-layer": {
+      "noFieldsMessage-no-string-fields": ""
+    },
     "plugin": {
       "basemap-layer-configured-server-admin": ""
     },
     "style-editor": {
+      "horizontal-align-options": {
+        "label-center": "",
+        "label-left": "",
+        "label-right": ""
+      },
       "label-align": "",
       "label-baseline": "",
       "label-color": "Colore",
@@ -7225,7 +7464,14 @@
       "label-symbol-vertical-align": "",
       "label-text-label": "",
       "label-x-offset": "",
-      "label-y-offset": ""
+      "label-y-offset": "",
+      "placeholderText-select-symbol": "",
+      "placeholderText-select-symbol-or-add-text": "",
+      "vertical-align-options": {
+        "label-bottom": "",
+        "label-center": "",
+        "label-top": ""
+      }
     },
     "style-rule-editor": {
       "aria-label-comparison-operator": "Operatore di confronto",
@@ -7236,6 +7482,15 @@
       "placeholder-feature-property": "",
       "placeholder-numeric-value": "",
       "placeholder-value": "valore"
+    },
+    "tooltip-options": {
+      "description-details": "",
+      "description-none": "",
+      "label-details": "",
+      "label-none": ""
+    },
+    "utils": {
+      "get-next-layer-name": ""
     }
   },
   "get-enterprise": {
@@ -7485,7 +7740,8 @@
       "aria-label-selected-color": "Colore {{colorLabel}}"
     },
     "confirm-button": {
-      "cancel": "Annulla"
+      "cancel": "Annulla",
+      "confirmText-delete": ""
     },
     "confirm-content": {
       "placeholder": "Digita \"{{confirmPromptText}}\" per confermare"
@@ -7667,6 +7923,8 @@
     },
     "panel-chrome": {
       "aria-label-toggle-collapse": "attiva/disattiva il pannello di riduzione",
+      "ariaLabel-panel-loading": "",
+      "ariaLabel-panel-status": "",
       "tooltip-cancel": "Annulla query",
       "tooltip-cancel-loading": "Annulla query",
       "tooltip-stop-streaming": "Interrompi streaming",
@@ -7834,6 +8092,12 @@
       "footer-click-to-action": "Fai clic per {{actionTitle}}",
       "footer-click-to-navigate": "Fai clic per aprire {{linkTitle}}",
       "timestamp": "Indicazione data/ora"
+    },
+    "week-start-picker": {
+      "weekStarts-label-default": "",
+      "weekStarts-label-monday": "",
+      "weekStarts-label-saturday": "",
+      "weekStarts-label-sunday": ""
     }
   },
   "graph": {
@@ -8212,6 +8476,10 @@
     "add-library-panel-modal": {
       "title-create-library-panel": "Crea pannello della libreria"
     },
+    "change-library-panel-modal": {
+      "confirmText-change": "",
+      "confirmText-replace": ""
+    },
     "confirm": {
       "delete-panel": "Desideri eliminare questo pannello?"
     },
@@ -8656,6 +8924,8 @@
       "updated-on": "Aggiornato il"
     },
     "snapshot-list-table": {
+      "body-delete": "",
+      "confirmText-delete": "",
       "title-delete": "Elimina"
     },
     "unthemed-dashboard-import": {
@@ -8667,6 +8937,9 @@
       }
     }
   },
+  "metric-select": {
+    "noOptionsMessage-no-options-found": ""
+  },
   "migrate-to-cloud": {
     "build-snapshot": {
       "description": "Questo strumento può migrare alcune risorse da questa installazione al tuo stack cloud. Per iniziare, è necessario creare un'istantanea di questa installazione. La creazione di un'istantanea richiede in genere meno di due minuti. L'istantanea viene archiviata insieme a questa installazione di Grafana.",
@@ -9365,8 +9638,8 @@
     "marker": {
       "100-node-count": "",
       "aria-label-hidden-marker": "",
-      "node-count_one": "",
-      "node-count_other": ""
+      "node-count_one": "{{count}} nodi",
+      "node-count_other": "{{count}} nodi"
     },
     "node": {
       "aria-label-node-title": ""
@@ -9376,10 +9649,10 @@
       "aria-label-nodes-hidden-warning": "",
       "computing-layout": "",
       "no-data": "Nessun dato",
-      "hidden-nodes_one": "",
-      "hidden-nodes_other": "",
-      "processed-nodes_one": "",
-      "processed-nodes_other": ""
+      "hidden-nodes_one": "<0></0> {{count}} nodi sono nascosti per motivi di prestazioni.",
+      "hidden-nodes_other": "<0></0> {{count}} nodi sono nascosti per motivi di prestazioni.",
+      "processed-nodes_one": "<0></0> Il layout a livelli potrebbe essere lento con {{count}} nodi.",
+      "processed-nodes_other": "<0></0> Il layout a livelli potrebbe essere lento con {{count}} nodi."
     },
     "node-graph-panel": {
       "no-data-found-in-response": ""
@@ -9505,6 +9778,7 @@
     }
   },
   "org-picker": {
+    "noOptionsMessage-no-organizations-found": "",
     "select-placeholder": "Seleziona organizzazione"
   },
   "page": {
@@ -9727,6 +10001,7 @@
         "permission": "Non disponi dell'autorizzazione per visualizzare questa pagina.",
         "title-access-denied": "Accesso negato"
       },
+      "error-loading-plugin": "",
       "no-root-app-page-component-found": "Non è stato trovato alcun componente della pagina dell'app principale"
     },
     "browse": {
@@ -9770,8 +10045,7 @@
         "update-status-text": "plug-in aggiornati"
       },
       "versions": {
-        "confirmation-text-1": "Vuoi davvero effettuare il downgrade alla versione",
-        "confirmation-text-2": "Normalmente non dovresti farlo",
+        "confirmation-text": "",
         "downgrade-confirm": "Effettua il downgrade",
         "downgrade-title": "Effettua il downgrade della versione del plug-in"
       }
@@ -9825,6 +10099,10 @@
     "empty-state": {
       "message": "Nessun plug-in trovato"
     },
+    "extensions": {
+      "extension-error-alert-description": "",
+      "extension-error-alert-title": ""
+    },
     "extensions-log-data-source": {
       "message": {
         "ok": "OK"
@@ -9858,7 +10136,11 @@
       "updating": "Aggiornamento in corso"
     },
     "install-controls-button": {
-      "title-uninstall-modal": "Disinstalla {{plugin}}"
+      "title-uninstall-modal": "Disinstalla {{plugin}}",
+      "uninstall-controls": {
+        "body-uninstall-plugin": "",
+        "confirmText-confirm": ""
+      }
     },
     "install-controls-warning": {
       "body-not-published": "Questo componente aggiuntivo non è pubblicato su <2>grafana.com/plugins</2> e non può essere gestito tramite il catalogo.",
@@ -10894,6 +11176,7 @@
     }
   },
   "service-account-picker": {
+    "noOptionsMessage-no-service-accounts-found": "",
     "select-aria-label": "Selettore account di servizio",
     "select-placeholder": "Inizia a digitare per cercare gli account di servizio"
   },
@@ -10939,6 +11222,10 @@
     },
     "service-account-page-unconnected": {
       "add-service-account-token": "Aggiungi token dell'account di servizio",
+      "body-delete-service-account": "",
+      "body-disable-service-account": "",
+      "confirmText-delete-service-account": "",
+      "confirmText-disable-service-account": "",
       "delete-service-account": "Elimina account di servizio",
       "disable-service-account": "Disabilita account di servizio",
       "enable-service-account": "Abilita account di servizio",
@@ -10965,6 +11252,7 @@
       "used-by": "Utilizzato da"
     },
     "service-account-profile-row": {
+      "confirmText-save": "",
       "edit": "Modifica"
     },
     "service-account-role-row": {
@@ -10978,10 +11266,16 @@
     },
     "service-accounts-list-page-unconnected": {
       "add-service-account": "Aggiungi account di servizio",
+      "body-delete-with-tokens": "",
+      "body-disable-service-account": "",
+      "confirmText-delete": "",
+      "confirmText-disable-service-account": "",
       "placeholder-search-service-account-by-name": "Cerca account di servizio per nome",
       "sub-title": "Gli account di servizio e i relativi token possono essere utilizzati per autenticarsi con l'API Grafana. Scopri di più nella nostra <2>documentazione.</2>",
       "title-delete-service-account": "Elimina account di servizio",
-      "title-disable-service-account": "Disabilita account di servizio"
+      "title-disable-service-account": "Disabilita account di servizio",
+      "body-delete_one": "",
+      "body-delete_other": ""
     },
     "token-expiration": {
       "content-this-token-has-expired": "Questo token è scaduto",
@@ -11373,8 +11667,8 @@
       "label-never": ""
     },
     "status-history-panel": {
-      "too-many-points_one": "",
-      "too-many-points_other": ""
+      "too-many-points_one": "Troppi punti da visualizzare correttamente. <1></1>Aggiorna la query per restituire meno punti <3></3>({{count}} punti ricevuti)",
+      "too-many-points_other": "Troppi punti da visualizzare correttamente. <1></1>Aggiorna la query per restituire meno punti <3></3>({{count}} punti ricevuti)"
     }
   },
   "support-bundles": {
@@ -11518,6 +11812,7 @@
     "tag-option-label": "Opzione tag"
   },
   "team-picker": {
+    "noOptionsMessage-no-teams-found": "",
     "select-aria-label": "Selettore team",
     "select-placeholder": "Seleziona un team"
   },
@@ -11843,6 +12138,7 @@
     "convert-field-type-transformer-editor": {
       "aria-label-add-a-convert-field-type-transformer": "Aggiungi un trasformatore del tipo di campo di conversione",
       "aria-label-remove-convert-field-type-transformer": "Rimuovi il trasformatore del tipo di campo di conversione",
+      "convert-field-type": "",
       "label": {
         "browser": "Browser",
         "utc": ""
@@ -11885,6 +12181,11 @@
       "remove-enum-row-tooltip-delete": "Elimina"
     },
     "extract-fields-transformer-editor": {
+      "field-name-picker-settings": {
+        "placeholderText": {
+          "select-field": ""
+        }
+      },
       "label-delimiter": "Delimitatore",
       "label-format": "Formato",
       "label-keep-time": "Mantieni orario",
@@ -11898,6 +12199,14 @@
       "aria-label-threshold-color": "Colore soglia"
     },
     "field-lookup-transformer-editor": {
+      "field-name-picker-settings": {
+        "noFieldsMessage": {
+          "no-text-fields-found": ""
+        },
+        "placeholderText": {
+          "select-text-field": ""
+        }
+      },
       "label-field": "Campo",
       "label-lookup": "Ricerca"
     },
@@ -11923,10 +12232,30 @@
     },
     "filter-by-value-transformer-editor": {
       "add-condition": "Aggiungi condizione",
+      "filter-match": {
+        "label": {
+          "match-all": "",
+          "match-any": ""
+        }
+      },
+      "filter-types": {
+        "label": {
+          "exclude": "",
+          "include": ""
+        }
+      },
       "label-conditions": "Condizioni",
       "label-filter-type": "Tipo di filtro"
     },
     "format-string-transfomer-editor": {
+      "field-name-picker-settings": {
+        "noFieldsMessage": {
+          "no-text-fields-found": ""
+        },
+        "placeholderText": {
+          "select-text-field": ""
+        }
+      },
       "label-field": "Campo",
       "label-format": "Formato",
       "label-substring-range": "Intervallo di stringa secondaria"
@@ -12237,6 +12566,7 @@
     "title": "Organizzazioni"
   },
   "user-picker": {
+    "noOptionsMessage-no-users-found": "",
     "select-aria-label": "Selettore utente",
     "select-placeholder": "Inizia a digitare per cercare l'utente"
   },
@@ -12322,6 +12652,8 @@
       }
     },
     "confirm-delete-modal": {
+      "body-delete-variable": "",
+      "confirmText-delete": "",
       "title-delete-variable": "Elimina variabile"
     },
     "create-ad-hoc-variable-adapter": {
@@ -12370,9 +12702,24 @@
       "label-refresh": "Aggiorna"
     },
     "query-variable-sort-select": {
-      "description-values-variable": "Come ordinare i valori di questa variabile"
+      "description-values-variable": "Come ordinare i valori di questa variabile",
+      "name-sort": "",
+      "sort_options": {
+        "label": {
+          "alphabetical-asc": "",
+          "alphabetical-caseinsensitive-asc": "",
+          "alphabetical-caseinsensitive-desc": "",
+          "alphabetical-desc": "",
+          "disabled": "",
+          "natural-asc": "",
+          "natural-desc": "",
+          "numerical-asc": "",
+          "numerical-desc": ""
+        }
+      }
     },
     "text-box-variable-editor": {
+      "name-default-value": "",
       "placeholder-default-value-if-any": "valore predefinito, se presente",
       "text-options": "Opzioni testo"
     },
@@ -12401,6 +12748,8 @@
       "description-optional-display-name": "Nome visualizzato facoltativo",
       "description-template-variable-characters": "Il nome della variabile del modello. (Massimo 50 caratteri)",
       "general": "Generale",
+      "name-label": "",
+      "name-name": "",
       "placeholder-descriptive-text": "Testo descrittivo",
       "placeholder-label-name": "Nome etichetta",
       "placeholder-variable-name": "Nome variabile",
@@ -12415,9 +12764,15 @@
       "tooltip-duplicate-variable": "Duplica variabile",
       "tooltip-remove-variable": "Rimuovi variabile"
     },
+    "variable-editor-un-connected": {
+      "name-description": ""
+    },
     "variable-options": {
       "aria-label-toggle-all-values": "Attiva/disattiva tutti i valori"
     },
+    "variable-type-select": {
+      "name-select-variable-type": ""
+    },
     "variable-usages-button": {
       "tooltip-show-usages": "Mostra utilizzi"
     },
diff --git a/public/locales/ja-JP/grafana.json b/public/locales/ja-JP/grafana.json
index 8596e0ca673..e7b17865a55 100644
--- a/public/locales/ja-JP/grafana.json
+++ b/public/locales/ja-JP/grafana.json
@@ -84,6 +84,7 @@
     "admin-feature-toggles-table": {
       "confirm-modal-body-1": "一部機能は安定版（GA）として標準で有効になっていますが、いくつかの機能は現在暫定的なベータ版の段階であり、早期導入することが可能です。",
       "confirm-modal-body-2": "変更する前に、各機能の変更がもたらす影響を理解することをお勧めします。",
+      "confirmText-save-changes": "",
       "get-stage-cell": {
         "beta": "ベータ版",
         "content-general-availability": "一般提供",
@@ -96,14 +97,21 @@
     },
     "admin-orgs-table": {
       "aria-label-delete-org": "組織を削除",
+      "confirmText-delete": "",
       "title-delete": "削除"
     },
     "anon-users": {
       "not-found": "匿名ユーザーは見つかりませんでした。"
     },
     "base-user-sessions": {
+      "body-force-logout-from-all-devices": "",
+      "confirmText-confirm-logout": "",
+      "confirmText-force-logout": "",
       "title-force-logout-from-all-devices": "すべてのデバイスから強制ログアウトする"
     },
+    "change-org-button": {
+      "confirmText-save": ""
+    },
     "edit-org": {
       "access-denied": "この組織のユーザーを表示する権限がありません。この組織を更新するには、サーバー管理者に連絡してください。",
       "heading": "組織を編集",
@@ -208,9 +216,11 @@
       "not-editable": "このユーザーの役割は、認証プロバイダーから同期されているため編集できません。詳細については、<1>Grafana認証ドキュメント</1>を参照してください。"
     },
     "org-users-table": {
+      "body-delete": "",
       "columns": {
         "aria-label-role": "ロール"
       },
+      "confirmText-delete": "",
       "delete-aria-label": "ユーザーを削除：{{name}}",
       "title-delete": "削除"
     },
@@ -241,6 +251,9 @@
     "settings": {
       "info-description": "これらのシステム設定は、grafana.iniまたはcustom.iniで定義されています（またはENV変数で上書きされています）。これらを変更するには、現在、Grafanaを再起動する必要があります。"
     },
+    "un-themed-org-row": {
+      "confirmText-confirm-removal": ""
+    },
     "upgrade-info": {
       "title": "エンタープライズライセンス"
     },
@@ -293,12 +306,17 @@
     },
     "user-permissions": {
       "change-button": "変更",
+      "confirmText-change": "",
       "grafana-admin-key": "Grafana管理者",
       "grafana-admin-no": "いいえ",
       "grafana-admin-yes": "はい",
       "title": "権限"
     },
     "user-profile": {
+      "body-delete": "",
+      "body-disable": "",
+      "confirmText-delete-user": "",
+      "confirmText-disable-user": "",
       "delete-button": "ユーザーの削除",
       "disable-button": "無効のユーザー",
       "edit-button": "編集",
@@ -312,6 +330,9 @@
       "title-delete-user": "ユーザを削除",
       "title-disable-user": "ユーザーを無効化"
     },
+    "user-profile-row": {
+      "confirmText-save": ""
+    },
     "user-sessions": {
       "browser-column": "ブラウザとOS",
       "force-logout-all-button": "すべてのデバイスから強制ログアウト",
@@ -457,6 +478,9 @@
       "label-muting-grouping-and-timings-optional": "ミュート、グループ化、タイミング（任意）",
       "title-muting-grouping-and-timings": "ミュート、グループ化、タイミング"
     },
+    "alert-manager-picker": {
+      "noOptionsMessage-no-datasources-found": ""
+    },
     "alert-menu": {
       "copy-link": "リンクをコピー",
       "duplicate": "複製",
@@ -546,6 +570,7 @@
       "view-configuration": "設定を表示"
     },
     "alertmanager-config": {
+      "confirmText-yes-reset-configuration": "",
       "gma-manual-configuration-description": "内部Grafana Alertmanager設定は手動で変更できません。この設定を変更するには、UI経由で個々のリソースを編集してください。",
       "gma-manual-configuration-is-not-supported": "手動構成の変更はサポートされていません",
       "message": {
@@ -560,11 +585,13 @@
       "title-resetting-alertmanager-configuration": "Alertmanager設定のリセット"
     },
     "alertmanager-configuration-version-manager": {
+      "body-restore-configuration-version-unsaved-changes": "",
       "columns": {
         "compare": "比較",
         "restore": "復元",
         "text-latest": "最新"
       },
+      "confirmText-yes-restore-configuration": "",
       "loading": "読み込み中...",
       "no-previous-configurations": "以前の設定はありません",
       "this-might-take-a-while": "これには少し時間がかかります…",
@@ -844,8 +871,10 @@
     },
     "contact-point-header": {
       "aria-label-more-actions": "連絡先「{{contactPointName}}」のその他の操作",
+      "ariaLabel-delete": "",
       "button-edit": "編集",
       "button-view": "表示",
+      "export-ariaLabel-export": "",
       "export-label-export": "エクスポート",
       "label-delete": "削除",
       "label-manage-permissions": "権限を管理する",
@@ -1378,6 +1407,7 @@
       "label-disable-resolved-message": "解決済みメッセージを無効にする"
     },
     "grafana-evaluation-behavior-step": {
+      "loadingMessage-loading-groups": "",
       "message": {
         "must-be-a-positive-integer": "正の整数で入力してください。",
         "must-enter-a-group-name": "グループ名の入力が必要です"
@@ -1835,7 +1865,11 @@
             "other-data-sources": "その他のデータソース"
           }
         }
-      }
+      },
+      "noOptionsMessage-no-datasources-found": ""
+    },
+    "mute-timing-actions-button": {
+      "body-delete-mute-timing": ""
     },
     "mute-timing-actions-buttons": {
       "text-disabled": "無効",
@@ -2085,9 +2119,11 @@
       "update-errors": {
         "conflict": "通知ポリシーツリーは別のユーザーによって更新されました。",
         "error-code": "エラーメッセージ：「{{error}}」",
-        "fallback": "通知ポリシーの更新中にエラーが発生しました。",
+        "routes": {
+          "conflictingMatchers": ""
+        },
         "suffix": "ページを更新して、やり直してください。",
-        "title": "通知ポリシーの保存中にエラーが発生しました"
+        "title": ""
       },
       "n-more-policies_other": "{{count}}件の追加のポリシー"
     },
@@ -2142,6 +2178,7 @@
     "query-and-expressions-step": {
       "add-query": "クエリを追加",
       "body-queries-expressions-configured": "アラート対象となるクエリまたは式を少なくとも1つ作成してください",
+      "confirmText-deactivate": "",
       "expressions": "式",
       "loading-data-sources": "データソース読み込み中...",
       "manipulate-returned-queries-other-operations": "数式やその他の演算を使用してクエリから返されたデータを操作します。",
@@ -2209,6 +2246,7 @@
     "redirect-to-clone-rule": {
       "body-evaluation-group": "元のルールはプロビジョニングされたもので、UI上で作成したルールには使用できないため、コピーしたルールには新しい評価グループを設定する必要があります。",
       "body-not-provisioned": "新しいルールはプロビジョニングされたルールとしてマーク<1>されません</1>。",
+      "confirmText-copy": "",
       "title-copy-provisioned-alert-rule": "プロビジョニングされたアラートルールをコピー"
     },
     "redirect-to-rule-viewer": {
@@ -2405,8 +2443,6 @@
       "title-inspect-alert-rule": "アラートルールを検査"
     },
     "rule-list": {
-      "cannot-find-rule-details-for": "UID{{uid}}のルール詳細が見つかりません ",
-      "cannot-load-rule-details-for": "UID{{uid}}のルール詳細を読み込めません ",
       "configure-datasource": "構成",
       "draft-new-rule": "新しいルールの下書きを作成",
       "ds-error": {
@@ -2753,6 +2789,9 @@
       "existing-templates-selector-placeholder-choose-notification-template": "通知テンプレートを選択",
       "loading": "読み込み中...",
       "template-options": {
+        "ariaLabel": {
+          "select-notification-template": ""
+        },
         "label": {
           "select-notification-template": "通知テンプレートを選択"
         }
@@ -2779,6 +2818,8 @@
     },
     "templates-table": {
       "actions": "操作",
+      "body-delete-template-group": "",
+      "confirmText-yes-delete": "",
       "no-templates-defined": "テンプレートがまだ定義されていません。",
       "template-group": "テンプレートグループ",
       "title-delete-template-group": "テンプレートグループを削除"
@@ -2906,6 +2947,11 @@
         "title-delete-contact-point": "連絡先を削除"
       }
     },
+    "use-delete-modal": {
+      "modal": {
+        "confirmText-yes-delete": ""
+      }
+    },
     "use-delete-policy-modal": {
       "modal-element": {
         "title-delete-notification-policy": "通知ポリシーを削除"
@@ -3062,7 +3108,8 @@
     "annotation-field-mapper": {
       "annotation": "注釈",
       "first-value": "最初の値",
-      "from": ""
+      "from": "",
+      "noOptionsMessage-unknown-field-names": ""
     },
     "empty-state": {
       "button-title": "注釈クエリを追加",
@@ -3196,7 +3243,7 @@
       "team-ids-github": "チームIDの整数リスト。",
       "team-ids-label": "チームID",
       "team-ids-numbers": "チームIDは数字である必要があります。",
-      "team-ids-other": "チームIDの文字列リスト。",
+      "team-ids-other": "",
       "team-ids-placeholder": "チームIDを入力し、Enterキーを押して追加します",
       "teams-url-description": "チームIDを照会するために使用するURL。設定されていない場合、デフォルト値は/teamsです。",
       "teams-url-description-oauth": "「{{ teamsURLLabel }}」を設定する場合は、「{{ teamIDsAttributePathLabel }}」も設定する必要があります。",
@@ -3240,6 +3287,7 @@
       "additional-actions-menu": {
         "label-reset-to-default-values": "デフォルト値にリセット"
       },
+      "confirmText-reset": "",
       "disable": "無効化",
       "disabling": "無効にしています...",
       "discard": "破棄",
@@ -4162,8 +4210,8 @@
     }
   },
   "dashbaord-scene": {
-    "interval-variable-form": {
-      "description-auto-option": "指定した数で時間範囲を分割して、間隔を動的に計算します"
+    "variable-editor-form": {
+      "run-query": ""
     }
   },
   "dashboard": {
@@ -4325,6 +4373,9 @@
     },
     "dash-nav": {
       "on-open-snapshot-original": {
+        "confirmText": {
+          "proceed": ""
+        },
         "title": {
           "proceed-to-external-site": "外部サイトに移動しますか？"
         }
@@ -4539,6 +4590,13 @@
           "editable": "編集可能",
           "readonly": "読み取り専用"
         }
+      },
+      "graph_tooltip_options": {
+        "label": {
+          "default": "",
+          "shared-crosshair": "",
+          "shared-tooltip": ""
+        }
       }
     },
     "get-debug-dashboard": {
@@ -4842,6 +4900,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "ダッシュボードをバージョン{{version}}に復元してもよろしいですか？未保存の変更はすべて失われます。",
+      "confirmText-restore-version": "",
       "title-restore-version": "バージョンの復元"
     },
     "row-options-button": {
@@ -4892,6 +4951,9 @@
         "title-not-unique": "このタイトルは重複しています"
       }
     },
+    "save-dashboard": {
+      "message-dashboard-saved": ""
+    },
     "save-dashboard-as-button": {
       "save-as": "名前を付けて保存"
     },
@@ -4926,6 +4988,7 @@
     "save-dashboard-error-proxy": {
       "body-name-exists": "選択したフォルダには同じ名前のダッシュボードがすでに存在します。<1></1><2>このダッシュボードの保存を続行しますか？</2>",
       "body-version-mismatch": "他のユーザーがこのダッシュボードを更新しました<1></1><2>このダッシュボードを保存しますか？</2>",
+      "confirmText-save-and-overwrite": "",
       "title-name-exists": "競合",
       "title-version-mismatch": "競合"
     },
@@ -5122,7 +5185,9 @@
       "label-apply-transformation-to": "変換の適用先"
     },
     "transformation-operation-row": {
+      "body-delete": "",
       "render-actions": {
+        "confirmText-delete": "",
         "title-debug": "デバッグ",
         "title-disable-transformation": "変換を無効化",
         "title-filter": "フィルタリング",
@@ -5144,10 +5209,14 @@
       "show-images": "画像を表示",
       "title-add-another-transformation": "別の変換を追加"
     },
+    "un-theme-transformations-editor": {
+      "body-delete-all-transformations": ""
+    },
     "un-themed-transformations-editor": {
       "actions": {
         "add-another-transformation": "別の変換を追加"
       },
+      "confirmText-delete-all": "",
       "delete-all-transformations": "すべての変換を削除",
       "title-delete-all-transformations": "すべての変換を削除しますか？",
       "tooltip-clear-search": "検索結果をクリア",
@@ -5184,6 +5253,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "バージョン{{version}}の選択を切り替え",
       "date": "日付",
+      "name-latest": "",
       "notes": "メモ",
       "restore": "復元",
       "updated-by": "更新者",
@@ -5260,7 +5330,8 @@
       "description-enables-users-custom-values": "ユーザーがリストにカスタム値を追加できるようにします",
       "description-provide-dimensions-as-csv-dimension-name-dimension-id": "CSV形式で次のように次元を指定：{{name}}, {{value}}",
       "label-data-source": "データソース",
-      "label-use-static-key-dimensions": "静的キー次元を使用"
+      "label-use-static-key-dimensions": "静的キー次元を使用",
+      "name-allow-custom-values": ""
     },
     "add-to-dashboard": {
       "message": {
@@ -5333,6 +5404,9 @@
       }
     },
     "config-public-dashboard": {
+      "confirmText": {
+        "revoke-public-url": ""
+      },
       "title": {
         "revoke-public-url": "公開URLを取り消す"
       }
@@ -5344,6 +5418,7 @@
     },
     "custom-variable-form": {
       "custom-options": "カスタムオプション",
+      "name-values-separated-comma": "",
       "selection-options": "選択オプション"
     },
     "dashboard-edit-pane-renderer": {
@@ -5362,6 +5437,12 @@
       "label-type": "タイプ",
       "label-url": "URL",
       "label-with-tags": "タグ付き",
+      "link-type-options": {
+        "label": {
+          "dashboards": "",
+          "link": ""
+        }
+      },
       "placeholder-open-dashboard": "ダッシュボードを開く"
     },
     "dashboard-link-list": {
@@ -5408,6 +5489,8 @@
       "data-source-options": "データソースオプション",
       "description-instance-name-filter": "変数値リストで選択するデータソースインスタンスの正規表現フィルター。すべての場合は、空欄にしてください。",
       "example-instance-name-filter": "例：<codeExample />",
+      "name-instance-name-filter": "",
+      "name-type": "",
       "selection-options": "選択オプション"
     },
     "default-grid-layout-manager": {
@@ -5453,6 +5536,21 @@
     "empty-transformations-message": {
       "add-transformation": "変換を追加"
     },
+    "general-settings-edit-view": {
+      "editable_options": {
+        "label": {
+          "editable": "",
+          "readonly": ""
+        }
+      },
+      "graph_tooltip_options": {
+        "label": {
+          "default": "",
+          "shared-crosshair": "",
+          "shared-tooltip": ""
+        }
+      }
+    },
     "get-edit-options": {
       "title": {
         "column-options": "列オプション",
@@ -5483,7 +5581,8 @@
       "description-provide-dimensions-as-csv-dimension-name-dimension-id": "CSV形式で次のように次元を指定：{{name}}, {{value}}",
       "group-by-options": "グループ化オプション",
       "label-data-source": "データソース",
-      "label-use-static-group-by-dimensions": "静的グループ次元を使用"
+      "label-use-static-group-by-dimensions": "静的グループ次元を使用",
+      "name-allow-custom-values": ""
     },
     "help-wizard": {
       "copy-to-clipboard": "クリップボードにコピー",
@@ -5519,9 +5618,14 @@
       "apply": "適用"
     },
     "interval-variable-form": {
+      "description-auto-option": "",
       "description-calculated-value-below-threshold": "計算値はこのしきい値を下回りません",
       "description-step-count": "値を計算するために現在の時間範囲を分割する回数",
-      "interval-options": "間隔オプション"
+      "interval-options": "間隔オプション",
+      "name-auto-option": "",
+      "name-min-interval": "",
+      "name-step-count": "",
+      "name-values": ""
     },
     "json-model-edit-view": {
       "cancel-button": {
@@ -5545,6 +5649,9 @@
       "title-name-already-exists": "名前はすでに存在します"
     },
     "on-open-snapshot-original-dashboard": {
+      "confirmText": {
+        "proceed": ""
+      },
       "title": {
         "proceed-to-external-site": "外部サイトに移動しますか？"
       }
@@ -5580,6 +5687,8 @@
     },
     "panel-data-transformations-tab-rendered": {
       "add-another-transformation": "別の変換を追加",
+      "body-delete-all-transformations": "",
+      "confirmText-delete-all": "",
       "delete-all-transformations": "すべての変換を削除",
       "title-delete-all-transformations": "すべての変換を削除しますか？"
     },
@@ -5633,6 +5742,7 @@
       "description-optional": "シリーズ名やメトリックノードセグメントの一部を抽出したい場合の任意設定です。",
       "label-data-source": "データソース",
       "label-target-data-source": "ターゲットデータソース",
+      "name-regex": "",
       "query-options": "クエリオプション",
       "selection-options": "選択オプション"
     },
@@ -5647,6 +5757,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "ダッシュボードをバージョン{{version}}に復元してもよろしいですか？未保存の変更はすべて失われます。",
+      "confirmText-restore-version": "",
       "title-restore-version": "バージョンの復元"
     },
     "save-button": {
@@ -5739,7 +5850,11 @@
     "selection-options-form": {
       "description-enables-multiple-values-selected": "複数の値を同時に選択可能にします",
       "description-enables-option-include-variables": "すべての値を含めるオプションを有効にします",
-      "description-enables-users-custom-values": "ユーザーがリストにカスタム値を追加できるようにします"
+      "description-enables-users-custom-values": "ユーザーがリストにカスタム値を追加できるようにします",
+      "name-allow-custom-values": "",
+      "name-custom-all-value": "",
+      "name-include-all-option": "",
+      "name-multi-value": ""
     },
     "share-button": {
       "aria-label-sharedropdownmenu": "共有メニューを切り替え"
@@ -5759,6 +5874,9 @@
         "copy-to-clipboard-failed": "クリップボードへのコピーが失敗しました"
       }
     },
+    "text-box-variable": {
+      "name-default-value": ""
+    },
     "text-box-variable-form": {
       "placeholder-default-value-if-any": "（任意）",
       "text-options": "テキストオプション"
@@ -5782,6 +5900,8 @@
       }
     },
     "unlink-modal": {
+      "body-unlink-panel": "",
+      "confirmText-yes-unlink": "",
       "title-really-unlink-panel": "このパネルのリンクを解除してもよろしいですか？"
     },
     "unsaved-changes-modal": {
@@ -5798,6 +5918,9 @@
         }
       }
     },
+    "use-save-dashboard": {
+      "message-dashboard-saved": ""
+    },
     "variable-check-indicator": {
       "aria-label-variable-referenced-dashboard": "この変数はどの変数やダッシュボードからも参照されていません。",
       "aria-label-variable-referenced-other-variables-dashboard": "この変数は他の変数やダッシュボードから参照されています。",
@@ -5807,10 +5930,16 @@
     "variable-editor-form": {
       "aria-label-variable-editor-form": "変数エディタフォーム",
       "back-to-list": "一覧に戻る",
+      "confirmText": {
+        "delete-variable": ""
+      },
       "delete": "削除",
       "description-optional-display-name": "表示名（任意）",
       "description-template-variable-characters": "テンプレート変数の名前（最大50文字）。",
       "general": "一般",
+      "name-description": "",
+      "name-label": "",
+      "name-name": "",
       "placeholder-descriptive-text": "説明用のテキスト",
       "placeholder-label-name": "ラベル名",
       "placeholder-variable-name": "変数名",
@@ -5825,13 +5954,25 @@
       "variable": "変数"
     },
     "variable-editor-list-row": {
+      "body-delete-variable": "",
+      "confirmText-delete-variable": "",
       "title-delete-variable": "変数を削除",
       "tooltip-duplicate-variable": "変数を複製",
       "tooltip-remove-variable": "変数を削除"
     },
     "variable-hide-select": {
+      "hide_options": {
+        "label": {
+          "label": "",
+          "nothing": "",
+          "variable": ""
+        }
+      },
       "label": "非表示"
     },
+    "variable-type-select": {
+      "name-variable-type": ""
+    },
     "variable-usages-button": {
       "title-show-usages": "{{variableId}}の使用状況の表示",
       "tooltip-show-usages": "使用状況を表示"
@@ -5858,6 +5999,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "バージョン{{version}}の選択を切り替え",
       "date": "日付",
+      "name-latest": "",
       "notes": "メモ",
       "restore": "復元",
       "updated-by": "更新者",
@@ -6245,7 +6387,8 @@
       }
     },
     "color-dimension-editor": {
-      "label-fixed-color": ""
+      "label-fixed-color": "",
+      "noOptionsMessage-no-fields-found": ""
     },
     "file-dropzone-custom-children": {
       "upload": "アップロード"
@@ -6283,6 +6426,7 @@
       },
       "label-limit": "制限",
       "label-value": "値",
+      "noOptionsMessage-no-fields-found": "",
       "scalar-options": {
         "description-clamped": "",
         "description-mod": "",
@@ -6291,9 +6435,15 @@
       }
     },
     "scale-dimension-editor": {
+      "fixed-value-option": {
+        "label": {
+          "fixed-value": ""
+        }
+      },
       "label-max": "最大",
       "label-min": "最小",
-      "label-value": "値"
+      "label-value": "値",
+      "noOptionsMessage-no-fields-found": ""
     },
     "text-dimension-editor": {
       "description-field": "",
@@ -6865,6 +7015,8 @@
       "aria-label-select-service-name-operator": "サービス名演算子を選択",
       "aria-label-select-span-name": "スパン名を選択",
       "aria-label-select-span-name-operator": "スパン名演算子を選択",
+      "ariaLabel-select-max-span-duration": "",
+      "ariaLabel-select-min-span-duration": "",
       "label-collapse": "スパンフィルター",
       "label-duration": "継続時間",
       "label-service-name": "サービス名",
@@ -6935,6 +7087,8 @@
       "split-widen": "ペインを広げる"
     },
     "trace-page-actions": {
+      "ariaLabel-copy-trace-id": "",
+      "ariaLabel-export-trace": "",
       "give-feedback": "フィードバックを送信",
       "label-copied": "コピーしました！",
       "label-export": "エクスポート",
@@ -7072,6 +7226,7 @@
   },
   "folder-filter": {
     "clear-folder-button": "フォルダをクリア",
+    "noOptionsMessage-no-folders-found": "",
     "select-aria-label": "フォルダフィルター",
     "select-placeholder": "フォルダでフィルタリング"
   },
@@ -7140,7 +7295,53 @@
     "incomplete-request-error": "申し訳ありませんが、リクエストを完了できませんでした。もう一度やり直してください。",
     "send-custom-feedback": "送金"
   },
+  "geo": {
+    "get-geometry-field": {
+      "warning-gazetteer-not-found": "",
+      "warning-no-geometry": "",
+      "warning-select-geohash": "",
+      "warning-select-lat-long": "",
+      "warning-select-lookup": "",
+      "warning-unable-to-find": ""
+    },
+    "location-editor": {
+      "geohash-field": {
+        "no-fields-message": ""
+      },
+      "latitude-field": {
+        "no-fields-message": ""
+      },
+      "longitude-field": {
+        "no-fields-message": ""
+      },
+      "lookup-field": {
+        "no-fields-message": ""
+      },
+      "name-gazetteer": "",
+      "name-geohash-field": "",
+      "name-latitude-field": "",
+      "name-location-mode": "",
+      "name-longitude-field": "",
+      "name-lookup-field": ""
+    },
+    "location-more-editor": {
+      "mode-options": {
+        "description-auto": "",
+        "description-coords": "",
+        "description-geohash": "",
+        "description-lookup": "",
+        "label-auto": "",
+        "label-coords": "",
+        "label-geohash": "",
+        "label-lookup": ""
+      }
+    }
+  },
   "geomap": {
+    "category-basemap-layer": "",
+    "category-map-controls": "",
+    "category-map-layers": "",
+    "category-map-view": "",
     "coordinates-map-view-editor": {
       "label-latitude": "緯度",
       "label-longitude": "経度"
@@ -7149,6 +7350,14 @@
       "center": "中央:",
       "zoom": "ズーム:"
     },
+    "description-initial-view": "",
+    "description-mouse-wheel-zoom": "",
+    "description-share-view": "",
+    "description-show-attribution": "",
+    "description-show-debug": "",
+    "description-show-measure": "",
+    "description-show-scale": "",
+    "description-show-zoom": "",
     "fit-map-view-editor": {
       "all-layers-editor-fragment": {
         "label-layer": "レイヤー"
@@ -7171,6 +7380,14 @@
     "geomap-style-rules-editor": {
       "aria-label-add-geomap-style-rule": "ジオマップスタイルルールを追加"
     },
+    "layer-editor": {
+      "category-base-layer": "",
+      "description-display-tooltip": "",
+      "name-data": "",
+      "name-display-tooltip": "",
+      "name-layer-type": "",
+      "name-opacity": ""
+    },
     "layers-editor": {
       "label-add-layer": "レイヤーを追加",
       "no-layers": "レイヤーがありませんか？"
@@ -7181,16 +7398,38 @@
       "label-zoom": "ズーム",
       "use-current-map-settings": "現在のマップ設定を使用"
     },
+    "markers-layer": {
+      "description-show-legend": "",
+      "name-show-legend": "",
+      "name-styles": ""
+    },
     "markers-legend": {
       "title-symbol": "シンボル"
     },
     "measure-overlay": {
       "tooltip-show-measure-tools": "測定ツールを表示"
     },
+    "name-initial-view": "",
+    "name-mouse-wheel-zoom": "",
+    "name-share-view": "",
+    "name-show-attribution": "",
+    "name-show-debug": "",
+    "name-show-measure": "",
+    "name-show-scale": "",
+    "name-show-zoom": "",
+    "name-tooltip": "",
+    "photos-layer": {
+      "noFieldsMessage-no-string-fields": ""
+    },
     "plugin": {
       "basemap-layer-configured-server-admin": "ベースマップレイヤーはサーバー管理者によって設定されます。"
     },
     "style-editor": {
+      "horizontal-align-options": {
+        "label-center": "",
+        "label-left": "",
+        "label-right": ""
+      },
       "label-align": "配置",
       "label-baseline": "ベースライン",
       "label-color": "色",
@@ -7204,7 +7443,14 @@
       "label-symbol-vertical-align": "シンボルの垂直配置",
       "label-text-label": "テキストラベル",
       "label-x-offset": "Xオフセット",
-      "label-y-offset": "Yオフセット"
+      "label-y-offset": "Yオフセット",
+      "placeholderText-select-symbol": "",
+      "placeholderText-select-symbol-or-add-text": "",
+      "vertical-align-options": {
+        "label-bottom": "",
+        "label-center": "",
+        "label-top": ""
+      }
     },
     "style-rule-editor": {
       "aria-label-comparison-operator": "比較演算子",
@@ -7215,6 +7461,15 @@
       "placeholder-feature-property": "機能プロパティ",
       "placeholder-numeric-value": "数値",
       "placeholder-value": "値"
+    },
+    "tooltip-options": {
+      "description-details": "",
+      "description-none": "",
+      "label-details": "",
+      "label-none": ""
+    },
+    "utils": {
+      "get-next-layer-name": ""
     }
   },
   "get-enterprise": {
@@ -7464,7 +7719,8 @@
       "aria-label-selected-color": "{{colorLabel}}色"
     },
     "confirm-button": {
-      "cancel": "キャンセル"
+      "cancel": "キャンセル",
+      "confirmText-delete": ""
     },
     "confirm-content": {
       "placeholder": "「{{confirmPromptText}}」と入力して確認"
@@ -7646,6 +7902,8 @@
     },
     "panel-chrome": {
       "aria-label-toggle-collapse": "パネルを折りたたむの切り替え",
+      "ariaLabel-panel-loading": "",
+      "ariaLabel-panel-status": "",
       "tooltip-cancel": "クエリをキャンセル",
       "tooltip-cancel-loading": "クエリをキャンセル",
       "tooltip-stop-streaming": "ストリーミングを停止",
@@ -7813,6 +8071,12 @@
       "footer-click-to-action": "クリックして{{actionTitle}}",
       "footer-click-to-navigate": "クリックして{{linkTitle}}を開く",
       "timestamp": "タイムスタンプ"
+    },
+    "week-start-picker": {
+      "weekStarts-label-default": "",
+      "weekStarts-label-monday": "",
+      "weekStarts-label-saturday": "",
+      "weekStarts-label-sunday": ""
     }
   },
   "graph": {
@@ -8189,6 +8453,10 @@
     "add-library-panel-modal": {
       "title-create-library-panel": "ライブラリパネルを作成"
     },
+    "change-library-panel-modal": {
+      "confirmText-change": "",
+      "confirmText-replace": ""
+    },
     "confirm": {
       "delete-panel": "このパネルを削除しますか？"
     },
@@ -8630,6 +8898,8 @@
       "updated-on": "更新日"
     },
     "snapshot-list-table": {
+      "body-delete": "",
+      "confirmText-delete": "",
       "title-delete": "削除"
     },
     "unthemed-dashboard-import": {
@@ -8641,6 +8911,9 @@
       }
     }
   },
+  "metric-select": {
+    "noOptionsMessage-no-options-found": ""
+  },
   "migrate-to-cloud": {
     "build-snapshot": {
       "description": "このツールを使用すると、このインストールからクラウドスタックに一部のリソースを移行できます。開始するには、このインストールのスナップショットを作成する必要があります。スナップショットの作成には通常2分未満かかります。スナップショットは、このGrafanaインストールと一緒に保存されます。",
@@ -9476,6 +9749,7 @@
     }
   },
   "org-picker": {
+    "noOptionsMessage-no-organizations-found": "",
     "select-placeholder": "組織を選択"
   },
   "page": {
@@ -9698,6 +9972,7 @@
         "permission": "このページを表示する権限がありません。",
         "title-access-denied": "アクセス拒否"
       },
+      "error-loading-plugin": "",
       "no-root-app-page-component-found": "ルートアプリのページコンポーネントが見つかりません"
     },
     "browse": {
@@ -9741,8 +10016,7 @@
         "update-status-text": "すべてのプラグインが更新されました"
       },
       "versions": {
-        "confirmation-text-1": "バージョンにダウングレードしてもよろしいですか？",
-        "confirmation-text-2": "通常、これを行うべきではありません",
+        "confirmation-text": "",
         "downgrade-confirm": "ダウングレード",
         "downgrade-title": "プラグインのバージョンをダウングレードする"
       }
@@ -9796,6 +10070,10 @@
     "empty-state": {
       "message": "プラグインが見つかりませんでした"
     },
+    "extensions": {
+      "extension-error-alert-description": "",
+      "extension-error-alert-title": ""
+    },
     "extensions-log-data-source": {
       "message": {
         "ok": "OK"
@@ -9829,7 +10107,11 @@
       "updating": "更新中"
     },
     "install-controls-button": {
-      "title-uninstall-modal": "{{plugin}}をアンインストール "
+      "title-uninstall-modal": "{{plugin}}をアンインストール ",
+      "uninstall-controls": {
+        "body-uninstall-plugin": "",
+        "confirmText-confirm": ""
+      }
     },
     "install-controls-warning": {
       "body-not-published": "このプラグインは<2>grafana.com/plugins</2>に公開されておらず、カタログから管理できません。",
@@ -10860,6 +11142,7 @@
     }
   },
   "service-account-picker": {
+    "noOptionsMessage-no-service-accounts-found": "",
     "select-aria-label": "サービスアカウント選択ツール",
     "select-placeholder": "サービスアカウントを検索するには入力を開始してください"
   },
@@ -10905,6 +11188,10 @@
     },
     "service-account-page-unconnected": {
       "add-service-account-token": "サービスアカウントトークンを追加",
+      "body-delete-service-account": "",
+      "body-disable-service-account": "",
+      "confirmText-delete-service-account": "",
+      "confirmText-disable-service-account": "",
       "delete-service-account": "サービスアカウントを削除",
       "disable-service-account": "サービスアカウントを無効化",
       "enable-service-account": "サービスアカウントを有効化",
@@ -10931,6 +11218,7 @@
       "used-by": "使用者"
     },
     "service-account-profile-row": {
+      "confirmText-save": "",
       "edit": "編集"
     },
     "service-account-role-row": {
@@ -10944,10 +11232,15 @@
     },
     "service-accounts-list-page-unconnected": {
       "add-service-account": "サービスアカウントを追加",
+      "body-delete-with-tokens": "",
+      "body-disable-service-account": "",
+      "confirmText-delete": "",
+      "confirmText-disable-service-account": "",
       "placeholder-search-service-account-by-name": "名前でサービスアカウントを検索",
       "sub-title": "サービスアカウントとそのトークンを使用して、Grafana APIに対する認証を行えます。詳細については<2>ドキュメント</2>をご覧ください",
       "title-delete-service-account": "サービスアカウントを削除",
-      "title-disable-service-account": "サービスアカウントを無効化"
+      "title-disable-service-account": "サービスアカウントを無効化",
+      "body-delete_other": ""
     },
     "token-expiration": {
       "content-this-token-has-expired": "このトークンは期限切れです",
@@ -11483,6 +11776,7 @@
     "tag-option-label": "タグオプション"
   },
   "team-picker": {
+    "noOptionsMessage-no-teams-found": "",
     "select-aria-label": "チームの選択ツール",
     "select-placeholder": "チームを選択"
   },
@@ -11808,6 +12102,7 @@
     "convert-field-type-transformer-editor": {
       "aria-label-add-a-convert-field-type-transformer": "フィールドタイプ変換機能を追加",
       "aria-label-remove-convert-field-type-transformer": "フィールドタイプ変換機能を削除",
+      "convert-field-type": "",
       "label": {
         "browser": "ブラウザ",
         "utc": "UTC"
@@ -11850,6 +12145,11 @@
       "remove-enum-row-tooltip-delete": "削除"
     },
     "extract-fields-transformer-editor": {
+      "field-name-picker-settings": {
+        "placeholderText": {
+          "select-field": ""
+        }
+      },
       "label-delimiter": "区切り文字",
       "label-format": "形式",
       "label-keep-time": "時間を保持",
@@ -11863,6 +12163,14 @@
       "aria-label-threshold-color": "しきい値の色"
     },
     "field-lookup-transformer-editor": {
+      "field-name-picker-settings": {
+        "noFieldsMessage": {
+          "no-text-fields-found": ""
+        },
+        "placeholderText": {
+          "select-text-field": ""
+        }
+      },
       "label-field": "フィールド",
       "label-lookup": "検索"
     },
@@ -11888,10 +12196,30 @@
     },
     "filter-by-value-transformer-editor": {
       "add-condition": "条件を追加",
+      "filter-match": {
+        "label": {
+          "match-all": "",
+          "match-any": ""
+        }
+      },
+      "filter-types": {
+        "label": {
+          "exclude": "",
+          "include": ""
+        }
+      },
       "label-conditions": "条件",
       "label-filter-type": "フィルタータイプ"
     },
     "format-string-transfomer-editor": {
+      "field-name-picker-settings": {
+        "noFieldsMessage": {
+          "no-text-fields-found": ""
+        },
+        "placeholderText": {
+          "select-text-field": ""
+        }
+      },
       "label-field": "フィールド",
       "label-format": "形式",
       "label-substring-range": "部分文字列の範囲"
@@ -12202,6 +12530,7 @@
     "title": "組織"
   },
   "user-picker": {
+    "noOptionsMessage-no-users-found": "",
     "select-aria-label": "ユーザー選択ツール",
     "select-placeholder": "ユーザーを検索するには入力を開始してください"
   },
@@ -12287,6 +12616,8 @@
       }
     },
     "confirm-delete-modal": {
+      "body-delete-variable": "",
+      "confirmText-delete": "",
       "title-delete-variable": "変数を削除"
     },
     "create-ad-hoc-variable-adapter": {
@@ -12335,9 +12666,24 @@
       "label-refresh": "更新"
     },
     "query-variable-sort-select": {
-      "description-values-variable": "この変数の値を並べ替える方法"
+      "description-values-variable": "この変数の値を並べ替える方法",
+      "name-sort": "",
+      "sort_options": {
+        "label": {
+          "alphabetical-asc": "",
+          "alphabetical-caseinsensitive-asc": "",
+          "alphabetical-caseinsensitive-desc": "",
+          "alphabetical-desc": "",
+          "disabled": "",
+          "natural-asc": "",
+          "natural-desc": "",
+          "numerical-asc": "",
+          "numerical-desc": ""
+        }
+      }
     },
     "text-box-variable-editor": {
+      "name-default-value": "",
       "placeholder-default-value-if-any": "デフォルト値（ある場合）",
       "text-options": "テキストオプション"
     },
@@ -12366,6 +12712,8 @@
       "description-optional-display-name": "表示名（任意）",
       "description-template-variable-characters": "テンプレート変数の名前（最大50文字）。",
       "general": "一般",
+      "name-label": "",
+      "name-name": "",
       "placeholder-descriptive-text": "説明用のテキスト",
       "placeholder-label-name": "ラベル名",
       "placeholder-variable-name": "変数名",
@@ -12380,9 +12728,15 @@
       "tooltip-duplicate-variable": "変数を複製",
       "tooltip-remove-variable": "変数を削除"
     },
+    "variable-editor-un-connected": {
+      "name-description": ""
+    },
     "variable-options": {
       "aria-label-toggle-all-values": "すべての値を切り替え"
     },
+    "variable-type-select": {
+      "name-select-variable-type": ""
+    },
     "variable-usages-button": {
       "tooltip-show-usages": "使用状況を表示"
     },
diff --git a/public/locales/ko-KR/grafana.json b/public/locales/ko-KR/grafana.json
index 61264e39511..5ffed66f289 100644
--- a/public/locales/ko-KR/grafana.json
+++ b/public/locales/ko-KR/grafana.json
@@ -84,6 +84,7 @@
     "admin-feature-toggles-table": {
       "confirm-modal-body-1": "일부 기능은 안정적이며(GA 단계) 기본적으로 활성화되어 있지만, 일부 기능은 현재 예비 베타 단계에 있으며 조기 도입이 가능하도록 제공하고 있습니다.",
       "confirm-modal-body-2": "변경 사항을 적용하기 전에 각 기능의 변경이 어떤 영향을 미칠지 파악하는 것이 좋습니다.",
+      "confirmText-save-changes": "",
       "get-stage-cell": {
         "beta": "베타",
         "content-general-availability": "정식 제공",
@@ -96,14 +97,21 @@
     },
     "admin-orgs-table": {
       "aria-label-delete-org": "조직 삭제",
+      "confirmText-delete": "",
       "title-delete": "삭제"
     },
     "anon-users": {
       "not-found": "익명의 사용자를 찾을 수 없습니다."
     },
     "base-user-sessions": {
+      "body-force-logout-from-all-devices": "",
+      "confirmText-confirm-logout": "",
+      "confirmText-force-logout": "",
       "title-force-logout-from-all-devices": "모든 장치에서 강제 로그아웃"
     },
+    "change-org-button": {
+      "confirmText-save": ""
+    },
     "edit-org": {
       "access-denied": "이 조직의 사용자를 볼 수 있는 권한이 없습니다. 이 조직을 업데이트하려면 서버 관리자에게 문의하세요.",
       "heading": "조직 편집",
@@ -208,9 +216,11 @@
       "not-editable": "이 사용자의 역할은 인증 제공자에서 동기화되었기 때문에 편집할 수 없습니다. 자세한 내용은 <1>Grafana 인증 문서</1>를 참고하세요."
     },
     "org-users-table": {
+      "body-delete": "",
       "columns": {
         "aria-label-role": "역할"
       },
+      "confirmText-delete": "",
       "delete-aria-label": "사용자 삭제: {{name}}",
       "title-delete": "삭제"
     },
@@ -241,6 +251,9 @@
     "settings": {
       "info-description": "이러한 시스템 설정은 grafana.ini 또는 custom.ini에 정의되어 있습니다(또는 ENV 변수에서 덮어쓰기됩니다). 현재 이를 변경하려면 Grafana를 다시 시작해야 합니다."
     },
+    "un-themed-org-row": {
+      "confirmText-confirm-removal": ""
+    },
     "upgrade-info": {
       "title": "Enterprise 라이선스"
     },
@@ -293,12 +306,17 @@
     },
     "user-permissions": {
       "change-button": "변경",
+      "confirmText-change": "",
       "grafana-admin-key": "Grafana 관리자",
       "grafana-admin-no": "아니요",
       "grafana-admin-yes": "네",
       "title": "권한"
     },
     "user-profile": {
+      "body-delete": "",
+      "body-disable": "",
+      "confirmText-delete-user": "",
+      "confirmText-disable-user": "",
       "delete-button": "사용자 삭제",
       "disable-button": "사용자 비활성화",
       "edit-button": "편집",
@@ -312,6 +330,9 @@
       "title-delete-user": "사용자 삭제",
       "title-disable-user": "사용자 비활성화"
     },
+    "user-profile-row": {
+      "confirmText-save": ""
+    },
     "user-sessions": {
       "browser-column": "브라우저 및 OS",
       "force-logout-all-button": "모든 장치에서 강제 로그아웃",
@@ -457,6 +478,9 @@
       "label-muting-grouping-and-timings-optional": "알림 비활성화, 그룹화 및 타이밍(선택 사항)",
       "title-muting-grouping-and-timings": "알림 비활성화, 그룹화 및 타이밍"
     },
+    "alert-manager-picker": {
+      "noOptionsMessage-no-datasources-found": ""
+    },
     "alert-menu": {
       "copy-link": "링크 복사",
       "duplicate": "복제",
@@ -546,6 +570,7 @@
       "view-configuration": "구성 보기"
     },
     "alertmanager-config": {
+      "confirmText-yes-reset-configuration": "",
       "gma-manual-configuration-description": "내부 Grafana Alertmanager 구성은 수동으로 변경할 수 없습니다. 이 구성을 변경하려면 UI를 통해 개별 리소스를 편집하세요.",
       "gma-manual-configuration-is-not-supported": "수동 구성 변경은 지원되지 않음",
       "message": {
@@ -560,11 +585,13 @@
       "title-resetting-alertmanager-configuration": "Alertmanager 구성 재설정 중"
     },
     "alertmanager-configuration-version-manager": {
+      "body-restore-configuration-version-unsaved-changes": "",
       "columns": {
         "compare": "비교",
         "restore": "복구",
         "text-latest": "최근"
       },
+      "confirmText-yes-restore-configuration": "",
       "loading": "로딩 중...",
       "no-previous-configurations": "이전 구성 없음",
       "this-might-take-a-while": "다소 시간이 걸릴 수 있습니다...",
@@ -844,8 +871,10 @@
     },
     "contact-point-header": {
       "aria-label-more-actions": "'{{contactPointName}}' 연락처에 대한 추가 동작",
+      "ariaLabel-delete": "",
       "button-edit": "편집",
       "button-view": "보기",
+      "export-ariaLabel-export": "",
       "export-label-export": "내보내기",
       "label-delete": "삭제",
       "label-manage-permissions": "권한 관리",
@@ -1378,6 +1407,7 @@
       "label-disable-resolved-message": "해제 메시지 비활성화"
     },
     "grafana-evaluation-behavior-step": {
+      "loadingMessage-loading-groups": "",
       "message": {
         "must-be-a-positive-integer": "양의 정수여야 합니다.",
         "must-enter-a-group-name": "그룹 이름을 입력해야 합니다."
@@ -1835,7 +1865,11 @@
             "other-data-sources": "기타 데이터 소스"
           }
         }
-      }
+      },
+      "noOptionsMessage-no-datasources-found": ""
+    },
+    "mute-timing-actions-button": {
+      "body-delete-mute-timing": ""
     },
     "mute-timing-actions-buttons": {
       "text-disabled": "비활성화됨",
@@ -2085,9 +2119,11 @@
       "update-errors": {
         "conflict": "알림 정책 트리가 다른 사용자에 의해 업데이트되었습니다.",
         "error-code": "오류 메시지: '{{error}}'",
-        "fallback": "알림 정책을 업데이트하는 중에 문제가 발생했습니다.",
+        "routes": {
+          "conflictingMatchers": ""
+        },
         "suffix": "페이지를 새로고침한 후 다시 시도해 주세요.",
-        "title": "알림 정책 저장 중 오류 발생"
+        "title": ""
       },
       "n-more-policies_other": "추가 정책 {{count}}개"
     },
@@ -2142,6 +2178,7 @@
     "query-and-expressions-step": {
       "add-query": "쿼리 추가",
       "body-queries-expressions-configured": "경고할 쿼리 또는 표현식을 하나 이상 생성합니다",
+      "confirmText-deactivate": "",
       "expressions": "표현식",
       "loading-data-sources": "데이터 소스 로딩 중...",
       "manipulate-returned-queries-other-operations": "쿼리에서 반환된 데이터를 수학 및 기타 연산으로 조작합니다.",
@@ -2209,6 +2246,7 @@
     "redirect-to-clone-rule": {
       "body-evaluation-group": "원본 규칙이 프로비저닝되어 UI에서 생성된 규칙에 사용할 수 없으므로 복사한 규칙에 대한 새 평가 그룹을 설정해야 합니다.",
       "body-not-provisioned": "새 규칙은 프로비저닝된 규칙으로 표시되지 <1>않습니다</1>.",
+      "confirmText-copy": "",
       "title-copy-provisioned-alert-rule": "프로비저닝된 경고 규칙 복사"
     },
     "redirect-to-rule-viewer": {
@@ -2405,8 +2443,6 @@
       "title-inspect-alert-rule": "경고 규칙 검사"
     },
     "rule-list": {
-      "cannot-find-rule-details-for": "UID {{uid}}에 대한 규칙 세부 정보를 찾을 수 없습니다",
-      "cannot-load-rule-details-for": "UID {{uid}}에 대한 규칙 세부 정보를 불러올 수 없습니다",
       "configure-datasource": "구성",
       "draft-new-rule": "새 규칙 초안 작성",
       "ds-error": {
@@ -2753,6 +2789,9 @@
       "existing-templates-selector-placeholder-choose-notification-template": "알림 템플릿 선택",
       "loading": "로딩 중...",
       "template-options": {
+        "ariaLabel": {
+          "select-notification-template": ""
+        },
         "label": {
           "select-notification-template": "알림 템플릿 선택"
         }
@@ -2779,6 +2818,8 @@
     },
     "templates-table": {
       "actions": "작업",
+      "body-delete-template-group": "",
+      "confirmText-yes-delete": "",
       "no-templates-defined": "정의된 템플릿이 없습니다.",
       "template-group": "템플릿 그룹",
       "title-delete-template-group": "템플릿 그룹 삭제"
@@ -2906,6 +2947,11 @@
         "title-delete-contact-point": "연락처 삭제"
       }
     },
+    "use-delete-modal": {
+      "modal": {
+        "confirmText-yes-delete": ""
+      }
+    },
     "use-delete-policy-modal": {
       "modal-element": {
         "title-delete-notification-policy": "알림 정책 삭제"
@@ -3062,7 +3108,8 @@
     "annotation-field-mapper": {
       "annotation": "주석",
       "first-value": "첫 번째 값",
-      "from": ""
+      "from": "",
+      "noOptionsMessage-unknown-field-names": ""
     },
     "empty-state": {
       "button-title": "주석 쿼리 추가",
@@ -3196,7 +3243,7 @@
       "team-ids-github": "팀 ID의 정수 목록입니다.",
       "team-ids-label": "팀 ID",
       "team-ids-numbers": "팀 ID는 숫자여야 합니다.",
-      "team-ids-other": "팀 ID의 문자열 목록입니다.",
+      "team-ids-other": "",
       "team-ids-placeholder": "팀 ID를 입력하고 엔터 키를 눌러 추가",
       "teams-url-description": "팀 ID에 대한 쿼리에 사용되는 URL입니다. 설정하지 않으면 기본값은 /teams입니다.",
       "teams-url-description-oauth": "\"{{ teamsURLLabel }}\"을(를) 구성하는 경우, \"{{ teamIDsAttributePathLabel }}\"도 구성해야 합니다.",
@@ -3240,6 +3287,7 @@
       "additional-actions-menu": {
         "label-reset-to-default-values": "기본값으로 재설정"
       },
+      "confirmText-reset": "",
       "disable": "비활성화",
       "disabling": "비활성화 중...",
       "discard": "무시",
@@ -4162,8 +4210,8 @@
     }
   },
   "dashbaord-scene": {
-    "interval-variable-form": {
-      "description-auto-option": "시간 범위를 지정된 수로 나누어 동적으로 간격을 계산합니다."
+    "variable-editor-form": {
+      "run-query": ""
     }
   },
   "dashboard": {
@@ -4325,6 +4373,9 @@
     },
     "dash-nav": {
       "on-open-snapshot-original": {
+        "confirmText": {
+          "proceed": ""
+        },
         "title": {
           "proceed-to-external-site": "외부 사이트로 이동하시겠어요?"
         }
@@ -4539,6 +4590,13 @@
           "editable": "편집 가능",
           "readonly": "읽기 전용"
         }
+      },
+      "graph_tooltip_options": {
+        "label": {
+          "default": "",
+          "shared-crosshair": "",
+          "shared-tooltip": ""
+        }
       }
     },
     "get-debug-dashboard": {
@@ -4842,6 +4900,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "정말 대시보드를 {{version}} 버전으로 복원하시겠어요? 저장하지 않은 변경 사항은 모두 손실됩니다.",
+      "confirmText-restore-version": "",
       "title-restore-version": "버전 복구"
     },
     "row-options-button": {
@@ -4892,6 +4951,9 @@
         "title-not-unique": "이 제목은 고유하지 않습니다"
       }
     },
+    "save-dashboard": {
+      "message-dashboard-saved": ""
+    },
     "save-dashboard-as-button": {
       "save-as": "다음 이름으로 저장"
     },
@@ -4926,6 +4988,7 @@
     "save-dashboard-error-proxy": {
       "body-name-exists": "선택한 폴더에 동일한 이름의 대시보드가 이미 존재합니다.<1></1><2>그래도 이 대시보드를 저장하시겠어요?</2>",
       "body-version-mismatch": "다른 사람이 이 대시보드를 업데이트했습니다<1></1><2>그래도 이 대시보드를 저장하시겠어요?</2>",
+      "confirmText-save-and-overwrite": "",
       "title-name-exists": "충돌",
       "title-version-mismatch": "충돌"
     },
@@ -5122,7 +5185,9 @@
       "label-apply-transformation-to": "변환 적용 대상"
     },
     "transformation-operation-row": {
+      "body-delete": "",
       "render-actions": {
+        "confirmText-delete": "",
         "title-debug": "디버그",
         "title-disable-transformation": "변환 비활성화",
         "title-filter": "필터",
@@ -5144,10 +5209,14 @@
       "show-images": "이미지 표시",
       "title-add-another-transformation": "다른 변환 추가"
     },
+    "un-theme-transformations-editor": {
+      "body-delete-all-transformations": ""
+    },
     "un-themed-transformations-editor": {
       "actions": {
         "add-another-transformation": "다른 변환 추가"
       },
+      "confirmText-delete-all": "",
       "delete-all-transformations": "모든 변환 삭제",
       "title-delete-all-transformations": "모든 변환을 삭제하시겠어요?",
       "tooltip-clear-search": "검색 초기화",
@@ -5184,6 +5253,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "{{version}} 버전 선택 토글",
       "date": "날짜",
+      "name-latest": "",
       "notes": "메모",
       "restore": "복구",
       "updated-by": "업데이트한 사용자",
@@ -5260,7 +5330,8 @@
       "description-enables-users-custom-values": "사용자가 목록에 사용자 지정 값을 추가할 수 있습니다",
       "description-provide-dimensions-as-csv-dimension-name-dimension-id": "차원에 대한 다음 정보를 CSV로 제공: {{name}}, {{value}}",
       "label-data-source": "데이터 소스",
-      "label-use-static-key-dimensions": "고정 키 차원 사용"
+      "label-use-static-key-dimensions": "고정 키 차원 사용",
+      "name-allow-custom-values": ""
     },
     "add-to-dashboard": {
       "message": {
@@ -5333,6 +5404,9 @@
       }
     },
     "config-public-dashboard": {
+      "confirmText": {
+        "revoke-public-url": ""
+      },
       "title": {
         "revoke-public-url": "공개 URL 철회"
       }
@@ -5344,6 +5418,7 @@
     },
     "custom-variable-form": {
       "custom-options": "사용자 지정 옵션",
+      "name-values-separated-comma": "",
       "selection-options": "선택 옵션"
     },
     "dashboard-edit-pane-renderer": {
@@ -5362,6 +5437,12 @@
       "label-type": "유형",
       "label-url": "URL",
       "label-with-tags": "태그 포함",
+      "link-type-options": {
+        "label": {
+          "dashboards": "",
+          "link": ""
+        }
+      },
       "placeholder-open-dashboard": "대시보드 열기"
     },
     "dashboard-link-list": {
@@ -5408,6 +5489,8 @@
       "data-source-options": "데이터 소스 옵션",
       "description-instance-name-filter": "변수 값 목록에서 어떤 데이터 소스 인스턴스를 선택할지에 대한 정규 표현식 필터입니다. 모두 비워 둡니다.",
       "example-instance-name-filter": "예시: <codeExample />",
+      "name-instance-name-filter": "",
+      "name-type": "",
       "selection-options": "선택 옵션"
     },
     "default-grid-layout-manager": {
@@ -5453,6 +5536,21 @@
     "empty-transformations-message": {
       "add-transformation": "변환 추가"
     },
+    "general-settings-edit-view": {
+      "editable_options": {
+        "label": {
+          "editable": "",
+          "readonly": ""
+        }
+      },
+      "graph_tooltip_options": {
+        "label": {
+          "default": "",
+          "shared-crosshair": "",
+          "shared-tooltip": ""
+        }
+      }
+    },
     "get-edit-options": {
       "title": {
         "column-options": "열 옵션",
@@ -5483,7 +5581,8 @@
       "description-provide-dimensions-as-csv-dimension-name-dimension-id": "차원에 대한 다음 정보를 CSV로 제공: {{name}}, {{value}}",
       "group-by-options": "옵션을 기준으로 그룹화",
       "label-data-source": "데이터 소스",
-      "label-use-static-group-by-dimensions": "고정 그룹 차원 사용"
+      "label-use-static-group-by-dimensions": "고정 그룹 차원 사용",
+      "name-allow-custom-values": ""
     },
     "help-wizard": {
       "copy-to-clipboard": "클립보드로 복사",
@@ -5519,9 +5618,14 @@
       "apply": "적용"
     },
     "interval-variable-form": {
+      "description-auto-option": "",
       "description-calculated-value-below-threshold": "계산된 값은 이 임계값 아래로 내려가지 않습니다",
       "description-step-count": "값을 계산하기 위해 현재 시간 범위를 나눌 횟수",
-      "interval-options": "간격 옵션"
+      "interval-options": "간격 옵션",
+      "name-auto-option": "",
+      "name-min-interval": "",
+      "name-step-count": "",
+      "name-values": ""
     },
     "json-model-edit-view": {
       "cancel-button": {
@@ -5545,6 +5649,9 @@
       "title-name-already-exists": "이미 존재하는 이름입니다"
     },
     "on-open-snapshot-original-dashboard": {
+      "confirmText": {
+        "proceed": ""
+      },
       "title": {
         "proceed-to-external-site": "외부 사이트로 이동하시겠어요?"
       }
@@ -5580,6 +5687,8 @@
     },
     "panel-data-transformations-tab-rendered": {
       "add-another-transformation": "다른 변환 추가",
+      "body-delete-all-transformations": "",
+      "confirmText-delete-all": "",
       "delete-all-transformations": "모든 변환 삭제",
       "title-delete-all-transformations": "모든 변환을 삭제하시겠어요?"
     },
@@ -5633,6 +5742,7 @@
       "description-optional": "선택 사항, 시리즈 이름 또는 메트릭 노드 세그먼트의 일부를 추출하려는 경우.",
       "label-data-source": "데이터 소스",
       "label-target-data-source": "대상 데이터 소스",
+      "name-regex": "",
       "query-options": "쿼리 옵션",
       "selection-options": "선택 옵션"
     },
@@ -5647,6 +5757,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "정말 대시보드를 {{version}} 버전으로 복원하시겠어요? 저장하지 않은 변경 사항은 모두 손실됩니다.",
+      "confirmText-restore-version": "",
       "title-restore-version": "버전 복구"
     },
     "save-button": {
@@ -5739,7 +5850,11 @@
     "selection-options-form": {
       "description-enables-multiple-values-selected": "여러 값을 동시에 선택할 수 있도록 합니다",
       "description-enables-option-include-variables": "모든 값을 포함하는 옵션 활성화",
-      "description-enables-users-custom-values": "사용자가 목록에 사용자 지정 값을 추가할 수 있습니다"
+      "description-enables-users-custom-values": "사용자가 목록에 사용자 지정 값을 추가할 수 있습니다",
+      "name-allow-custom-values": "",
+      "name-custom-all-value": "",
+      "name-include-all-option": "",
+      "name-multi-value": ""
     },
     "share-button": {
       "aria-label-sharedropdownmenu": "공유 메뉴 토글"
@@ -5759,6 +5874,9 @@
         "copy-to-clipboard-failed": "클립보드로 복사 실패"
       }
     },
+    "text-box-variable": {
+      "name-default-value": ""
+    },
     "text-box-variable-form": {
       "placeholder-default-value-if-any": "(선택 사항)",
       "text-options": "텍스트 옵션"
@@ -5782,6 +5900,8 @@
       }
     },
     "unlink-modal": {
+      "body-unlink-panel": "",
+      "confirmText-yes-unlink": "",
       "title-really-unlink-panel": "정말 이 패널의 연결을 해제하시겠어요?"
     },
     "unsaved-changes-modal": {
@@ -5798,6 +5918,9 @@
         }
       }
     },
+    "use-save-dashboard": {
+      "message-dashboard-saved": ""
+    },
     "variable-check-indicator": {
       "aria-label-variable-referenced-dashboard": "이 변수는 어떤 변수나 대시보드에서도 참조되지 않습니다.",
       "aria-label-variable-referenced-other-variables-dashboard": "이 변수는 다른 변수 또는 대시보드에서 참조됩니다.",
@@ -5807,10 +5930,16 @@
     "variable-editor-form": {
       "aria-label-variable-editor-form": "변수 편집기 양식",
       "back-to-list": "목록으로 돌아가기",
+      "confirmText": {
+        "delete-variable": ""
+      },
       "delete": "삭제",
       "description-optional-display-name": "표시 이름(선택 사항)",
       "description-template-variable-characters": "템플릿 변수의 이름입니다. (최대 50자)",
       "general": "일반",
+      "name-description": "",
+      "name-label": "",
+      "name-name": "",
       "placeholder-descriptive-text": "설명 텍스트",
       "placeholder-label-name": "라벨 이름",
       "placeholder-variable-name": "변수 이름",
@@ -5825,13 +5954,25 @@
       "variable": "변수"
     },
     "variable-editor-list-row": {
+      "body-delete-variable": "",
+      "confirmText-delete-variable": "",
       "title-delete-variable": "변수 삭제",
       "tooltip-duplicate-variable": "변수 복제",
       "tooltip-remove-variable": "변수 제거"
     },
     "variable-hide-select": {
+      "hide_options": {
+        "label": {
+          "label": "",
+          "nothing": "",
+          "variable": ""
+        }
+      },
       "label": "숨기기"
     },
+    "variable-type-select": {
+      "name-variable-type": ""
+    },
     "variable-usages-button": {
       "title-show-usages": "다음 변수의 사용처 표시 중: {{variableId}}",
       "tooltip-show-usages": "사용처 표시"
@@ -5858,6 +5999,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "{{version}} 버전 선택 토글",
       "date": "날짜",
+      "name-latest": "",
       "notes": "메모",
       "restore": "복구",
       "updated-by": "업데이트한 사용자",
@@ -6245,7 +6387,8 @@
       }
     },
     "color-dimension-editor": {
-      "label-fixed-color": ""
+      "label-fixed-color": "",
+      "noOptionsMessage-no-fields-found": ""
     },
     "file-dropzone-custom-children": {
       "upload": "업로드"
@@ -6283,6 +6426,7 @@
       },
       "label-limit": "제한",
       "label-value": "값",
+      "noOptionsMessage-no-fields-found": "",
       "scalar-options": {
         "description-clamped": "",
         "description-mod": "",
@@ -6291,9 +6435,15 @@
       }
     },
     "scale-dimension-editor": {
+      "fixed-value-option": {
+        "label": {
+          "fixed-value": ""
+        }
+      },
       "label-max": "최대",
       "label-min": "최소",
-      "label-value": "값"
+      "label-value": "값",
+      "noOptionsMessage-no-fields-found": ""
     },
     "text-dimension-editor": {
       "description-field": "",
@@ -6865,6 +7015,8 @@
       "aria-label-select-service-name-operator": "서비스 이름 연산자 선택",
       "aria-label-select-span-name": "스팬 이름 선택",
       "aria-label-select-span-name-operator": "스팬 이름 연산자 선택",
+      "ariaLabel-select-max-span-duration": "",
+      "ariaLabel-select-min-span-duration": "",
       "label-collapse": "스팬 필터",
       "label-duration": "지속 시간",
       "label-service-name": "서비스 이름",
@@ -6935,6 +7087,8 @@
       "split-widen": "창 확대"
     },
     "trace-page-actions": {
+      "ariaLabel-copy-trace-id": "",
+      "ariaLabel-export-trace": "",
       "give-feedback": "피드백 제출하기",
       "label-copied": "복사됨!",
       "label-export": "내보내기",
@@ -7072,6 +7226,7 @@
   },
   "folder-filter": {
     "clear-folder-button": "폴더 비우기",
+    "noOptionsMessage-no-folders-found": "",
     "select-aria-label": "폴더 필터",
     "select-placeholder": "폴더별로 필터링"
   },
@@ -7140,7 +7295,53 @@
     "incomplete-request-error": "죄송합니다. 요청을 완료할 수 없었습니다. 다시 시도해 주세요.",
     "send-custom-feedback": "전송"
   },
+  "geo": {
+    "get-geometry-field": {
+      "warning-gazetteer-not-found": "",
+      "warning-no-geometry": "",
+      "warning-select-geohash": "",
+      "warning-select-lat-long": "",
+      "warning-select-lookup": "",
+      "warning-unable-to-find": ""
+    },
+    "location-editor": {
+      "geohash-field": {
+        "no-fields-message": ""
+      },
+      "latitude-field": {
+        "no-fields-message": ""
+      },
+      "longitude-field": {
+        "no-fields-message": ""
+      },
+      "lookup-field": {
+        "no-fields-message": ""
+      },
+      "name-gazetteer": "",
+      "name-geohash-field": "",
+      "name-latitude-field": "",
+      "name-location-mode": "",
+      "name-longitude-field": "",
+      "name-lookup-field": ""
+    },
+    "location-more-editor": {
+      "mode-options": {
+        "description-auto": "",
+        "description-coords": "",
+        "description-geohash": "",
+        "description-lookup": "",
+        "label-auto": "",
+        "label-coords": "",
+        "label-geohash": "",
+        "label-lookup": ""
+      }
+    }
+  },
   "geomap": {
+    "category-basemap-layer": "",
+    "category-map-controls": "",
+    "category-map-layers": "",
+    "category-map-view": "",
     "coordinates-map-view-editor": {
       "label-latitude": "위도",
       "label-longitude": "경도"
@@ -7149,6 +7350,14 @@
       "center": "중앙:",
       "zoom": "확대/축소:"
     },
+    "description-initial-view": "",
+    "description-mouse-wheel-zoom": "",
+    "description-share-view": "",
+    "description-show-attribution": "",
+    "description-show-debug": "",
+    "description-show-measure": "",
+    "description-show-scale": "",
+    "description-show-zoom": "",
     "fit-map-view-editor": {
       "all-layers-editor-fragment": {
         "label-layer": "레이어"
@@ -7171,6 +7380,14 @@
     "geomap-style-rules-editor": {
       "aria-label-add-geomap-style-rule": "지오맵(GeoMap) 스타일 규칙 추가하기"
     },
+    "layer-editor": {
+      "category-base-layer": "",
+      "description-display-tooltip": "",
+      "name-data": "",
+      "name-display-tooltip": "",
+      "name-layer-type": "",
+      "name-opacity": ""
+    },
     "layers-editor": {
       "label-add-layer": "레이어 추가",
       "no-layers": "레이어가 없나요?"
@@ -7181,16 +7398,38 @@
       "label-zoom": "확대/축소",
       "use-current-map-settings": "현재 지도 설정 사용"
     },
+    "markers-layer": {
+      "description-show-legend": "",
+      "name-show-legend": "",
+      "name-styles": ""
+    },
     "markers-legend": {
       "title-symbol": "기호"
     },
     "measure-overlay": {
       "tooltip-show-measure-tools": "측정 도구 표시"
     },
+    "name-initial-view": "",
+    "name-mouse-wheel-zoom": "",
+    "name-share-view": "",
+    "name-show-attribution": "",
+    "name-show-debug": "",
+    "name-show-measure": "",
+    "name-show-scale": "",
+    "name-show-zoom": "",
+    "name-tooltip": "",
+    "photos-layer": {
+      "noFieldsMessage-no-string-fields": ""
+    },
     "plugin": {
       "basemap-layer-configured-server-admin": "베이스맵 레이어는 서버 관리자가 구성합니다."
     },
     "style-editor": {
+      "horizontal-align-options": {
+        "label-center": "",
+        "label-left": "",
+        "label-right": ""
+      },
       "label-align": "정렬",
       "label-baseline": "베이스라인",
       "label-color": "색상",
@@ -7204,7 +7443,14 @@
       "label-symbol-vertical-align": "기호 세로 정렬",
       "label-text-label": "텍스트 레이블",
       "label-x-offset": "X축 상쇄",
-      "label-y-offset": "Y축 상쇄"
+      "label-y-offset": "Y축 상쇄",
+      "placeholderText-select-symbol": "",
+      "placeholderText-select-symbol-or-add-text": "",
+      "vertical-align-options": {
+        "label-bottom": "",
+        "label-center": "",
+        "label-top": ""
+      }
     },
     "style-rule-editor": {
       "aria-label-comparison-operator": "비교 연산자",
@@ -7215,6 +7461,15 @@
       "placeholder-feature-property": "기능 속성",
       "placeholder-numeric-value": "숫자 값",
       "placeholder-value": "값"
+    },
+    "tooltip-options": {
+      "description-details": "",
+      "description-none": "",
+      "label-details": "",
+      "label-none": ""
+    },
+    "utils": {
+      "get-next-layer-name": ""
     }
   },
   "get-enterprise": {
@@ -7464,7 +7719,8 @@
       "aria-label-selected-color": "{{colorLabel}} 색상"
     },
     "confirm-button": {
-      "cancel": "취소"
+      "cancel": "취소",
+      "confirmText-delete": ""
     },
     "confirm-content": {
       "placeholder": "확인하려면 '{{confirmPromptText}}'을(를) 입력하세요."
@@ -7646,6 +7902,8 @@
     },
     "panel-chrome": {
       "aria-label-toggle-collapse": "패널 접기 토글",
+      "ariaLabel-panel-loading": "",
+      "ariaLabel-panel-status": "",
       "tooltip-cancel": "쿼리 취소",
       "tooltip-cancel-loading": "쿼리 취소",
       "tooltip-stop-streaming": "스트리밍 중지",
@@ -7813,6 +8071,12 @@
       "footer-click-to-action": "클릭하여 {{actionTitle}} 작업 수행",
       "footer-click-to-navigate": "클릭하여 {{linkTitle}} 열기",
       "timestamp": "시간 기록"
+    },
+    "week-start-picker": {
+      "weekStarts-label-default": "",
+      "weekStarts-label-monday": "",
+      "weekStarts-label-saturday": "",
+      "weekStarts-label-sunday": ""
     }
   },
   "graph": {
@@ -8189,6 +8453,10 @@
     "add-library-panel-modal": {
       "title-create-library-panel": "라이브러리 패널 생성"
     },
+    "change-library-panel-modal": {
+      "confirmText-change": "",
+      "confirmText-replace": ""
+    },
     "confirm": {
       "delete-panel": "이 패널을 삭제하시겠어요?"
     },
@@ -8630,6 +8898,8 @@
       "updated-on": "업데이트 날짜"
     },
     "snapshot-list-table": {
+      "body-delete": "",
+      "confirmText-delete": "",
       "title-delete": "삭제"
     },
     "unthemed-dashboard-import": {
@@ -8641,6 +8911,9 @@
       }
     }
   },
+  "metric-select": {
+    "noOptionsMessage-no-options-found": ""
+  },
   "migrate-to-cloud": {
     "build-snapshot": {
       "description": "이 도구를 사용하면 현재 설치 인스턴스에서 클라우드 스택으로 일부 리소스를 마이그레이션할 수 있습니다. 시작하려면 이 설치 인스턴스에 대한 스냅샷을 생성해야 합니다. 스냅샷을 생성하는 데는 일반적으로 2분이 채 걸리지 않습니다. 현재 Grafana 설치 인스턴스와 함께 해당 스냅샷이 저장됩니다.",
@@ -9476,6 +9749,7 @@
     }
   },
   "org-picker": {
+    "noOptionsMessage-no-organizations-found": "",
     "select-placeholder": "조직 선택"
   },
   "page": {
@@ -9698,6 +9972,7 @@
         "permission": "이 페이지를 볼 수 있는 권한이 없습니다.",
         "title-access-denied": "액세스 거부됨"
       },
+      "error-loading-plugin": "",
       "no-root-app-page-component-found": "루트 앱 페이지 구성 요소를 찾을 수 없습니다"
     },
     "browse": {
@@ -9741,8 +10016,7 @@
         "update-status-text": "플러그인 업데이트 완료"
       },
       "versions": {
-        "confirmation-text-1": "정말 버전으로 다운그레이드하시겠어요?",
-        "confirmation-text-2": "권장하지 않는 작업입니다.",
+        "confirmation-text": "",
         "downgrade-confirm": "다운그레이드",
         "downgrade-title": "플러그인 버전 다운그레이드"
       }
@@ -9796,6 +10070,10 @@
     "empty-state": {
       "message": "찾은 플러그인 없음"
     },
+    "extensions": {
+      "extension-error-alert-description": "",
+      "extension-error-alert-title": ""
+    },
     "extensions-log-data-source": {
       "message": {
         "ok": "확인"
@@ -9829,7 +10107,11 @@
       "updating": "업데이트 중"
     },
     "install-controls-button": {
-      "title-uninstall-modal": "{{plugin}} 제거"
+      "title-uninstall-modal": "{{plugin}} 제거",
+      "uninstall-controls": {
+        "body-uninstall-plugin": "",
+        "confirmText-confirm": ""
+      }
     },
     "install-controls-warning": {
       "body-not-published": "이 플러그인은 <2>grafana.com/plugins</2>에 게시되어 있지 않으며 카탈로그를 통해 관리할 수 없습니다.",
@@ -10860,6 +11142,7 @@
     }
   },
   "service-account-picker": {
+    "noOptionsMessage-no-service-accounts-found": "",
     "select-aria-label": "서비스 계정 선택기",
     "select-placeholder": "입력하여 서비스 계정 검색"
   },
@@ -10905,6 +11188,10 @@
     },
     "service-account-page-unconnected": {
       "add-service-account-token": "서비스 계정 토큰 추가",
+      "body-delete-service-account": "",
+      "body-disable-service-account": "",
+      "confirmText-delete-service-account": "",
+      "confirmText-disable-service-account": "",
       "delete-service-account": "서비스 계정 삭제",
       "disable-service-account": "서비스 계정 비활성화",
       "enable-service-account": "서비스 계정 활성화",
@@ -10931,6 +11218,7 @@
       "used-by": "사용자"
     },
     "service-account-profile-row": {
+      "confirmText-save": "",
       "edit": "편집"
     },
     "service-account-role-row": {
@@ -10944,10 +11232,15 @@
     },
     "service-accounts-list-page-unconnected": {
       "add-service-account": "서비스 계정 추가",
+      "body-delete-with-tokens": "",
+      "body-disable-service-account": "",
+      "confirmText-delete": "",
+      "confirmText-disable-service-account": "",
       "placeholder-search-service-account-by-name": "이름으로 서비스 계정 검색",
       "sub-title": "서비스 계정과 해당 계정의 토큰을 사용하여 Grafana API에 대한 인증을 수행할 수 있습니다. 자세한 내용은 Grafana의 <2>문서</2>",
       "title-delete-service-account": "서비스 계정 삭제",
-      "title-disable-service-account": "서비스 계정 비활성화"
+      "title-disable-service-account": "서비스 계정 비활성화",
+      "body-delete_other": ""
     },
     "token-expiration": {
       "content-this-token-has-expired": "이 토큰은 만료되었습니다",
@@ -11483,6 +11776,7 @@
     "tag-option-label": "태그 옵션"
   },
   "team-picker": {
+    "noOptionsMessage-no-teams-found": "",
     "select-aria-label": "팀 선택기",
     "select-placeholder": "팀 선택"
   },
@@ -11808,6 +12102,7 @@
     "convert-field-type-transformer-editor": {
       "aria-label-add-a-convert-field-type-transformer": "변환 필드 유형 변환기 추가",
       "aria-label-remove-convert-field-type-transformer": "변환 필드 유형 변환기 제거",
+      "convert-field-type": "",
       "label": {
         "browser": "브라우저",
         "utc": "UTC"
@@ -11850,6 +12145,11 @@
       "remove-enum-row-tooltip-delete": "삭제"
     },
     "extract-fields-transformer-editor": {
+      "field-name-picker-settings": {
+        "placeholderText": {
+          "select-field": ""
+        }
+      },
       "label-delimiter": "구분 기호",
       "label-format": "형식",
       "label-keep-time": "시간 유지",
@@ -11863,6 +12163,14 @@
       "aria-label-threshold-color": "임계값 색상"
     },
     "field-lookup-transformer-editor": {
+      "field-name-picker-settings": {
+        "noFieldsMessage": {
+          "no-text-fields-found": ""
+        },
+        "placeholderText": {
+          "select-text-field": ""
+        }
+      },
       "label-field": "필드",
       "label-lookup": "조회"
     },
@@ -11888,10 +12196,30 @@
     },
     "filter-by-value-transformer-editor": {
       "add-condition": "조건 추가",
+      "filter-match": {
+        "label": {
+          "match-all": "",
+          "match-any": ""
+        }
+      },
+      "filter-types": {
+        "label": {
+          "exclude": "",
+          "include": ""
+        }
+      },
       "label-conditions": "조건",
       "label-filter-type": "필터 유형"
     },
     "format-string-transfomer-editor": {
+      "field-name-picker-settings": {
+        "noFieldsMessage": {
+          "no-text-fields-found": ""
+        },
+        "placeholderText": {
+          "select-text-field": ""
+        }
+      },
       "label-field": "필드",
       "label-format": "형식",
       "label-substring-range": "부분 문자열 범위"
@@ -12202,6 +12530,7 @@
     "title": "조직"
   },
   "user-picker": {
+    "noOptionsMessage-no-users-found": "",
     "select-aria-label": "사용자 선택기",
     "select-placeholder": "입력하여 사용자 검색"
   },
@@ -12287,6 +12616,8 @@
       }
     },
     "confirm-delete-modal": {
+      "body-delete-variable": "",
+      "confirmText-delete": "",
       "title-delete-variable": "변수 삭제"
     },
     "create-ad-hoc-variable-adapter": {
@@ -12335,9 +12666,24 @@
       "label-refresh": "새로 고침"
     },
     "query-variable-sort-select": {
-      "description-values-variable": "이 변수의 값을 정렬하는 방법"
+      "description-values-variable": "이 변수의 값을 정렬하는 방법",
+      "name-sort": "",
+      "sort_options": {
+        "label": {
+          "alphabetical-asc": "",
+          "alphabetical-caseinsensitive-asc": "",
+          "alphabetical-caseinsensitive-desc": "",
+          "alphabetical-desc": "",
+          "disabled": "",
+          "natural-asc": "",
+          "natural-desc": "",
+          "numerical-asc": "",
+          "numerical-desc": ""
+        }
+      }
     },
     "text-box-variable-editor": {
+      "name-default-value": "",
       "placeholder-default-value-if-any": "기본값(있는 경우)",
       "text-options": "텍스트 옵션"
     },
@@ -12366,6 +12712,8 @@
       "description-optional-display-name": "표시 이름(선택 사항)",
       "description-template-variable-characters": "템플릿 변수의 이름입니다. (최대 50자)",
       "general": "일반",
+      "name-label": "",
+      "name-name": "",
       "placeholder-descriptive-text": "설명 텍스트",
       "placeholder-label-name": "라벨 이름",
       "placeholder-variable-name": "변수 이름",
@@ -12380,9 +12728,15 @@
       "tooltip-duplicate-variable": "변수 복제",
       "tooltip-remove-variable": "변수 제거"
     },
+    "variable-editor-un-connected": {
+      "name-description": ""
+    },
     "variable-options": {
       "aria-label-toggle-all-values": "모든 값 토글"
     },
+    "variable-type-select": {
+      "name-select-variable-type": ""
+    },
     "variable-usages-button": {
       "tooltip-show-usages": "사용처 표시"
     },
diff --git a/public/locales/nl-NL/grafana.json b/public/locales/nl-NL/grafana.json
index 55f484ff8d8..ae3b81983b0 100644
--- a/public/locales/nl-NL/grafana.json
+++ b/public/locales/nl-NL/grafana.json
@@ -84,6 +84,7 @@
     "admin-feature-toggles-table": {
       "confirm-modal-body-1": "Sommige functies zijn stabiel (GA) en standaard ingeschakeld, terwijl sommige zich momenteel in de voorlopige bètafase bevinden en beschikbaar zijn voor vroege adoptie.",
       "confirm-modal-body-2": "We raden aan om de implicaties van elke functiewijziging te begrijpen voordat je wijzigingen aanbrengt.",
+      "confirmText-save-changes": "",
       "get-stage-cell": {
         "beta": "Bèta",
         "content-general-availability": "Algemene beschikbaarheid",
@@ -96,14 +97,21 @@
     },
     "admin-orgs-table": {
       "aria-label-delete-org": "Organisatie verwijderen",
+      "confirmText-delete": "",
       "title-delete": "Verwijderen"
     },
     "anon-users": {
       "not-found": "Geen anonieme gebruikers gevonden."
     },
     "base-user-sessions": {
+      "body-force-logout-from-all-devices": "",
+      "confirmText-confirm-logout": "",
+      "confirmText-force-logout": "",
       "title-force-logout-from-all-devices": "Uitloggen van alle apparaten forceren"
     },
+    "change-org-button": {
+      "confirmText-save": ""
+    },
     "edit-org": {
       "access-denied": "Je hebt geen toestemming om gebruikers in deze organisatie te zien. Neem contact op met je serverbeheerder om deze organisatie bij te werken.",
       "heading": "Organisatie bewerken",
@@ -208,9 +216,11 @@
       "not-editable": "De rol van deze gebruiker kan niet worden bewerkt omdat deze is gesynchroniseerd met je authenticatieprovider. Raadpleeg de <1>Grafana-authenticatiedocumenten </1> voor meer informatie."
     },
     "org-users-table": {
+      "body-delete": "",
       "columns": {
         "aria-label-role": "Rol"
       },
+      "confirmText-delete": "",
       "delete-aria-label": "Gebruiker verwijderen: {{name}}",
       "title-delete": "Verwijderen"
     },
@@ -241,6 +251,9 @@
     "settings": {
       "info-description": "Deze systeeminstellingen worden gedefinieerd in grafana.ini of custom.ini (of overschreven in ENV-variabelen). Om deze te wijzigen moet je Grafana momenteel opnieuw opstarten."
     },
+    "un-themed-org-row": {
+      "confirmText-confirm-removal": ""
+    },
     "upgrade-info": {
       "title": "Enterprise-licentie"
     },
@@ -293,12 +306,17 @@
     },
     "user-permissions": {
       "change-button": "Wijzigen",
+      "confirmText-change": "",
       "grafana-admin-key": "Grafana-beheerder",
       "grafana-admin-no": "Nee",
       "grafana-admin-yes": "Ja",
       "title": "Toestemmingen"
     },
     "user-profile": {
+      "body-delete": "",
+      "body-disable": "",
+      "confirmText-delete-user": "",
+      "confirmText-disable-user": "",
       "delete-button": "Gebruiker verwijderen",
       "disable-button": "Gebruiker uitschakelen",
       "edit-button": "Bewerken",
@@ -312,6 +330,9 @@
       "title-delete-user": "Gebruiker verwijderen",
       "title-disable-user": "Gebruiker uitschakelen"
     },
+    "user-profile-row": {
+      "confirmText-save": ""
+    },
     "user-sessions": {
       "browser-column": "Browser en besturingssysteem",
       "force-logout-all-button": "Uitloggen van alle apparaten forceren",
@@ -461,6 +482,9 @@
       "label-muting-grouping-and-timings-optional": "Dempen, groeperen en timings (optioneel)",
       "title-muting-grouping-and-timings": "Dempen, groeperen en timings"
     },
+    "alert-manager-picker": {
+      "noOptionsMessage-no-datasources-found": ""
+    },
     "alert-menu": {
       "copy-link": "Link kopiëren",
       "duplicate": "Dupliceren",
@@ -550,6 +574,7 @@
       "view-configuration": "Configuratie bekijken"
     },
     "alertmanager-config": {
+      "confirmText-yes-reset-configuration": "",
       "gma-manual-configuration-description": "De interne Grafana Alertmanager-configuratie kan niet handmatig worden gewijzigd. Bewerk de individuele bronnen via de gebruikersinterface om deze configuratie te wijzigen.",
       "gma-manual-configuration-is-not-supported": "Handmatige configuratiewijzigingen worden niet ondersteund",
       "message": {
@@ -564,11 +589,13 @@
       "title-resetting-alertmanager-configuration": "Configuratie van Alertmanager opnieuw instellen"
     },
     "alertmanager-configuration-version-manager": {
+      "body-restore-configuration-version-unsaved-changes": "",
       "columns": {
         "compare": "Vergelijken",
         "restore": "Herstellen",
         "text-latest": "Nieuwste"
       },
+      "confirmText-yes-restore-configuration": "",
       "loading": "Bezig met laden ...",
       "no-previous-configurations": "Geen eerdere configuraties",
       "this-might-take-a-while": "Dit kan even duren...",
@@ -848,8 +875,10 @@
     },
     "contact-point-header": {
       "aria-label-more-actions": "Meer acties voor contactpunt '{{contactPointName}}'",
+      "ariaLabel-delete": "",
       "button-edit": "Bewerken",
       "button-view": "Weergave",
+      "export-ariaLabel-export": "",
       "export-label-export": "Exporteren",
       "label-delete": "Verwijderen",
       "label-manage-permissions": "Toestemmingen beheren",
@@ -1384,6 +1413,7 @@
       "label-disable-resolved-message": "Opgelost bericht uitschakelen"
     },
     "grafana-evaluation-behavior-step": {
+      "loadingMessage-loading-groups": "",
       "message": {
         "must-be-a-positive-integer": "Moet een positief geheel getal zijn.",
         "must-enter-a-group-name": "Een groepsnaam is vereist"
@@ -1842,7 +1872,11 @@
             "other-data-sources": "Andere gegevensbronnen"
           }
         }
-      }
+      },
+      "noOptionsMessage-no-datasources-found": ""
+    },
+    "mute-timing-actions-button": {
+      "body-delete-mute-timing": ""
     },
     "mute-timing-actions-buttons": {
       "text-disabled": "Uitgeschakeld",
@@ -2093,9 +2127,11 @@
       "update-errors": {
         "conflict": "Een andere gebruiker heeft wijzigingen aangebracht in de structuur van het notificatiebeleid.",
         "error-code": "Foutmelding: '{{error}}'",
-        "fallback": "Er ging iets mis bij het bijwerken van je meldingsbeleid.",
+        "routes": {
+          "conflictingMatchers": ""
+        },
         "suffix": "Vernieuw de pagina en probeer het opnieuw.",
-        "title": "Fout bij opslaan meldingsbeleid"
+        "title": ""
       },
       "n-more-policies_one": "{{count}} aanvullend beleid",
       "n-more-policies_other": "{{count}} aanvullend beleid"
@@ -2151,6 +2187,7 @@
     "query-and-expressions-step": {
       "add-query": "Query toevoegen",
       "body-queries-expressions-configured": "Maak ten minste één query of expressie om te worden gewaarschuwd",
+      "confirmText-deactivate": "",
       "expressions": "Expressie",
       "loading-data-sources": "Gegevensbronnen laden...",
       "manipulate-returned-queries-other-operations": "Manipuleer gegevens die worden geretourneerd uit query's met wiskundige en andere bewerkingen.",
@@ -2218,6 +2255,7 @@
     "redirect-to-clone-rule": {
       "body-evaluation-group": "Je moet een nieuwe evaluatiegroep instellen voor de gekopieerde regel omdat de oorspronkelijke is geprovisioneerd en niet kan worden gebruikt voor regels die in de gebruikersinterface zijn gemaakt.",
       "body-not-provisioned": "De nieuwe regel wordt <1>niet</1> gemarkeerd als een ingestelde regel.",
+      "confirmText-copy": "",
       "title-copy-provisioned-alert-rule": "Provisioned waarschuwingsregel kopiëren"
     },
     "redirect-to-rule-viewer": {
@@ -2415,8 +2453,6 @@
       "title-inspect-alert-rule": "Waarschuwingsregel inspecteren"
     },
     "rule-list": {
-      "cannot-find-rule-details-for": "Kan regelgegevens niet vinden voor UID {{uid}}",
-      "cannot-load-rule-details-for": "Kan regelgegevens niet laden voor UID {{uid}}",
       "configure-datasource": "Configureren",
       "draft-new-rule": "Een nieuwe regel opstellen",
       "ds-error": {
@@ -2766,6 +2802,9 @@
       "existing-templates-selector-placeholder-choose-notification-template": "Kies een meldingssjabloon",
       "loading": "Bezig met laden ...",
       "template-options": {
+        "ariaLabel": {
+          "select-notification-template": ""
+        },
         "label": {
           "select-notification-template": "Meldingssjabloon selecteren"
         }
@@ -2792,6 +2831,8 @@
     },
     "templates-table": {
       "actions": "Acties",
+      "body-delete-template-group": "",
+      "confirmText-yes-delete": "",
       "no-templates-defined": "Geen sjablonen gedefinieerd.",
       "template-group": "Sjabloongroep",
       "title-delete-template-group": "Sjabloongroep verwijderen"
@@ -2919,6 +2960,11 @@
         "title-delete-contact-point": "Contactpunt verwijderen"
       }
     },
+    "use-delete-modal": {
+      "modal": {
+        "confirmText-yes-delete": ""
+      }
+    },
     "use-delete-policy-modal": {
       "modal-element": {
         "title-delete-notification-policy": "Meldingsbeleid verwijderen"
@@ -3075,7 +3121,8 @@
     "annotation-field-mapper": {
       "annotation": "Opmerking",
       "first-value": "Eerste waarde",
-      "from": ""
+      "from": "",
+      "noOptionsMessage-unknown-field-names": ""
     },
     "empty-state": {
       "button-title": "Annotatiequery toevoegen",
@@ -3209,7 +3256,7 @@
       "team-ids-github": "Gehele lijst van team-id's.",
       "team-ids-label": "Team-id's",
       "team-ids-numbers": "Team-id's moeten cijfers zijn.",
-      "team-ids-other": "Tekenreekslijst met team-id's.",
+      "team-ids-other": "",
       "team-ids-placeholder": "Voer team-id's in en druk op Enter om toe te voegen",
       "teams-url-description": "De URL die wordt gebruikt om naar team-id's te zoeken. Indien niet ingesteld, is de standaardwaarde /teams.",
       "teams-url-description-oauth": "Als je '{{ teamsURLLabel }}' configureert, moet je ook '{{ teamIDsAttributePathLabel }}' configureren.",
@@ -3253,6 +3300,7 @@
       "additional-actions-menu": {
         "label-reset-to-default-values": "Terugzetten naar standaardwaarden"
       },
+      "confirmText-reset": "",
       "disable": "Uitschakelen",
       "disabling": "Uitschakelen...",
       "discard": "Negeren",
@@ -4180,8 +4228,8 @@
     }
   },
   "dashbaord-scene": {
-    "interval-variable-form": {
-      "description-auto-option": "Berekent dynamisch interval door tijdsbereik te delen door het opgegeven aantal"
+    "variable-editor-form": {
+      "run-query": ""
     }
   },
   "dashboard": {
@@ -4343,6 +4391,9 @@
     },
     "dash-nav": {
       "on-open-snapshot-original": {
+        "confirmText": {
+          "proceed": ""
+        },
         "title": {
           "proceed-to-external-site": "Doorgaan naar externe site?"
         }
@@ -4557,6 +4608,13 @@
           "editable": "Bewerkbaar",
           "readonly": "Alleen-lezen"
         }
+      },
+      "graph_tooltip_options": {
+        "label": {
+          "default": "",
+          "shared-crosshair": "",
+          "shared-tooltip": ""
+        }
       }
     },
     "get-debug-dashboard": {
@@ -4861,6 +4919,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "Weet je zeker dat je het dashboard naar versie {{version}} wilt herstellen? Alle niet opgeslagen wijzigingen zullen verloren gaan.",
+      "confirmText-restore-version": "",
       "title-restore-version": "Versie herstellen"
     },
     "row-options-button": {
@@ -4911,6 +4970,9 @@
         "title-not-unique": "Deze titel is niet uniek"
       }
     },
+    "save-dashboard": {
+      "message-dashboard-saved": ""
+    },
     "save-dashboard-as-button": {
       "save-as": "Opslaan als"
     },
@@ -4945,6 +5007,7 @@
     "save-dashboard-error-proxy": {
       "body-name-exists": "Er bestaat al een dashboard met dezelfde naam in de geselecteerde map.<1></1><2>Wil je dit dashboard nog steeds opslaan?</2>",
       "body-version-mismatch": "Iemand anders heeft dit dashboard bijgewerkt<1></1><2>Wil je dit dashboard nog steeds opslaan?</2>",
+      "confirmText-save-and-overwrite": "",
       "title-name-exists": "Conflict",
       "title-version-mismatch": "Conflict"
     },
@@ -5141,7 +5204,9 @@
       "label-apply-transformation-to": "Transformatie toepassen op"
     },
     "transformation-operation-row": {
+      "body-delete": "",
       "render-actions": {
+        "confirmText-delete": "",
         "title-debug": "Fouten opsporen",
         "title-disable-transformation": "Transformatie uitschakelen",
         "title-filter": "Filter",
@@ -5163,10 +5228,14 @@
       "show-images": "Afbeeldingen weergeven",
       "title-add-another-transformation": "Nog een transformatie toevoegen"
     },
+    "un-theme-transformations-editor": {
+      "body-delete-all-transformations": ""
+    },
     "un-themed-transformations-editor": {
       "actions": {
         "add-another-transformation": "Nog een transformatie toevoegen"
       },
+      "confirmText-delete-all": "",
       "delete-all-transformations": "Alle transformaties verwijderen",
       "title-delete-all-transformations": "Alle transformaties verwijderen?",
       "tooltip-clear-search": "Zoekopdracht wissen",
@@ -5203,6 +5272,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "Selectie van versie {{version}} in-/uitschakelen",
       "date": "Datum",
+      "name-latest": "",
       "notes": "Opmerkingen",
       "restore": "Herstellen",
       "updated-by": "Bijgewerkt door",
@@ -5279,7 +5349,8 @@
       "description-enables-users-custom-values": "Stelt gebruikers in staat om aangepaste waarden aan de lijst toe te voegen",
       "description-provide-dimensions-as-csv-dimension-name-dimension-id": "Geef afmetingen op als csv: {{name}}, {{value}}",
       "label-data-source": "Gegevensbron",
-      "label-use-static-key-dimensions": "Gebruik statische sleutelafmetingen"
+      "label-use-static-key-dimensions": "Gebruik statische sleutelafmetingen",
+      "name-allow-custom-values": ""
     },
     "add-to-dashboard": {
       "message": {
@@ -5352,6 +5423,9 @@
       }
     },
     "config-public-dashboard": {
+      "confirmText": {
+        "revoke-public-url": ""
+      },
       "title": {
         "revoke-public-url": "Openbare URL intrekken"
       }
@@ -5363,6 +5437,7 @@
     },
     "custom-variable-form": {
       "custom-options": "Aangepaste opties",
+      "name-values-separated-comma": "",
       "selection-options": "Selectiemogelijkheden"
     },
     "dashboard-edit-pane-renderer": {
@@ -5381,6 +5456,12 @@
       "label-type": "Type",
       "label-url": "URL",
       "label-with-tags": "Met labels",
+      "link-type-options": {
+        "label": {
+          "dashboards": "",
+          "link": ""
+        }
+      },
       "placeholder-open-dashboard": "Dashboard openen"
     },
     "dashboard-link-list": {
@@ -5427,6 +5508,8 @@
       "data-source-options": "Opties voor gegevensbronnen",
       "description-instance-name-filter": "Regex-filter voor welke gegevensbroninstanties uit de lijst met variabele waarden moet worden gekozen. Laat leeg voor alles.",
       "example-instance-name-filter": "Voorbeeld: <codeExample />",
+      "name-instance-name-filter": "",
+      "name-type": "",
       "selection-options": "Selectiemogelijkheden"
     },
     "default-grid-layout-manager": {
@@ -5472,6 +5555,21 @@
     "empty-transformations-message": {
       "add-transformation": "Transformatie toevoegen"
     },
+    "general-settings-edit-view": {
+      "editable_options": {
+        "label": {
+          "editable": "",
+          "readonly": ""
+        }
+      },
+      "graph_tooltip_options": {
+        "label": {
+          "default": "",
+          "shared-crosshair": "",
+          "shared-tooltip": ""
+        }
+      }
+    },
     "get-edit-options": {
       "title": {
         "column-options": "Kolomopties",
@@ -5502,7 +5600,8 @@
       "description-provide-dimensions-as-csv-dimension-name-dimension-id": "Geef afmetingen op als csv: {{name}}, {{value}}",
       "group-by-options": "Groeperen op opties",
       "label-data-source": "Gegevensbron",
-      "label-use-static-group-by-dimensions": "Gebruik statische groepsafmetingen"
+      "label-use-static-group-by-dimensions": "Gebruik statische groepsafmetingen",
+      "name-allow-custom-values": ""
     },
     "help-wizard": {
       "copy-to-clipboard": "Kopiëren naar klembord",
@@ -5538,9 +5637,14 @@
       "apply": "Toepassen"
     },
     "interval-variable-form": {
+      "description-auto-option": "",
       "description-calculated-value-below-threshold": "De berekende waarde zal niet onder deze drempelwaarde komen",
       "description-step-count": "Hoe vaak het huidige tijdbereik moet worden verdeeld om de waarde te berekenen",
-      "interval-options": "Opties voor intervallen"
+      "interval-options": "Opties voor intervallen",
+      "name-auto-option": "",
+      "name-min-interval": "",
+      "name-step-count": "",
+      "name-values": ""
     },
     "json-model-edit-view": {
       "cancel-button": {
@@ -5565,6 +5669,9 @@
       "title-name-already-exists": "Naam bestaat al"
     },
     "on-open-snapshot-original-dashboard": {
+      "confirmText": {
+        "proceed": ""
+      },
       "title": {
         "proceed-to-external-site": "Doorgaan naar externe site?"
       }
@@ -5600,6 +5707,8 @@
     },
     "panel-data-transformations-tab-rendered": {
       "add-another-transformation": "Nog een transformatie toevoegen",
+      "body-delete-all-transformations": "",
+      "confirmText-delete-all": "",
       "delete-all-transformations": "Alle transformaties verwijderen",
       "title-delete-all-transformations": "Alle transformaties verwijderen?"
     },
@@ -5653,6 +5762,7 @@
       "description-optional": "Optioneel, als je een deel van een serienaam of metrisch knooppuntsegment wilt extraheren.",
       "label-data-source": "Gegevensbron",
       "label-target-data-source": "Doelgegevensbron",
+      "name-regex": "",
       "query-options": "Opties voor query's",
       "selection-options": "Selectiemogelijkheden"
     },
@@ -5667,6 +5777,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "Weet je zeker dat je het dashboard naar versie {{version}} wilt herstellen? Alle niet opgeslagen wijzigingen zullen verloren gaan.",
+      "confirmText-restore-version": "",
       "title-restore-version": "Versie herstellen"
     },
     "save-button": {
@@ -5760,7 +5871,11 @@
     "selection-options-form": {
       "description-enables-multiple-values-selected": "Maakt het mogelijk om meerdere waarden tegelijkertijd te selecteren",
       "description-enables-option-include-variables": "Schakelt een optie in om alle waarden op te nemen",
-      "description-enables-users-custom-values": "Stelt gebruikers in staat om aangepaste waarden aan de lijst toe te voegen"
+      "description-enables-users-custom-values": "Stelt gebruikers in staat om aangepaste waarden aan de lijst toe te voegen",
+      "name-allow-custom-values": "",
+      "name-custom-all-value": "",
+      "name-include-all-option": "",
+      "name-multi-value": ""
     },
     "share-button": {
       "aria-label-sharedropdownmenu": "Menu delen in-/uitschakelen"
@@ -5780,6 +5895,9 @@
         "copy-to-clipboard-failed": "Kopiëren naar klembord mislukt"
       }
     },
+    "text-box-variable": {
+      "name-default-value": ""
+    },
     "text-box-variable-form": {
       "placeholder-default-value-if-any": "(optioneel)",
       "text-options": "Tekstopties"
@@ -5803,6 +5921,8 @@
       }
     },
     "unlink-modal": {
+      "body-unlink-panel": "",
+      "confirmText-yes-unlink": "",
       "title-really-unlink-panel": "Wil je dit paneel echt ontkoppelen?"
     },
     "unsaved-changes-modal": {
@@ -5819,6 +5939,9 @@
         }
       }
     },
+    "use-save-dashboard": {
+      "message-dashboard-saved": ""
+    },
     "variable-check-indicator": {
       "aria-label-variable-referenced-dashboard": "Er wordt door geen enkele variabele of dashboard naar deze variabele verwezen.",
       "aria-label-variable-referenced-other-variables-dashboard": "Deze variabele wordt gebruikt door andere variabelen of dashboard.",
@@ -5828,10 +5951,16 @@
     "variable-editor-form": {
       "aria-label-variable-editor-form": "Formulier variabele bewerker",
       "back-to-list": "Terug naar lijst",
+      "confirmText": {
+        "delete-variable": ""
+      },
       "delete": "Verwijderen",
       "description-optional-display-name": "Optionele weergavenaam",
       "description-template-variable-characters": "De naam van de sjabloonvariabele. (Max. 50 tekens)",
       "general": "Algemeen",
+      "name-description": "",
+      "name-label": "",
+      "name-name": "",
       "placeholder-descriptive-text": "Omschrijving",
       "placeholder-label-name": "Labelnaam",
       "placeholder-variable-name": "Naam variabele",
@@ -5846,13 +5975,25 @@
       "variable": "Variabele"
     },
     "variable-editor-list-row": {
+      "body-delete-variable": "",
+      "confirmText-delete-variable": "",
       "title-delete-variable": "Variabele verwijderen",
       "tooltip-duplicate-variable": "Variabele dupliceren",
       "tooltip-remove-variable": "Variabele verwijderen"
     },
     "variable-hide-select": {
+      "hide_options": {
+        "label": {
+          "label": "",
+          "nothing": "",
+          "variable": ""
+        }
+      },
       "label": "Verbergen"
     },
+    "variable-type-select": {
+      "name-variable-type": ""
+    },
     "variable-usages-button": {
       "title-show-usages": "Gebruik weergeven voor: {{variableId}}",
       "tooltip-show-usages": "Gebruik weergeven"
@@ -5879,6 +6020,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "Selectie van versie {{version}} in-/uitschakelen",
       "date": "Datum",
+      "name-latest": "",
       "notes": "Opmerkingen",
       "restore": "Herstellen",
       "updated-by": "Bijgewerkt door",
@@ -6266,7 +6408,8 @@
       }
     },
     "color-dimension-editor": {
-      "label-fixed-color": ""
+      "label-fixed-color": "",
+      "noOptionsMessage-no-fields-found": ""
     },
     "file-dropzone-custom-children": {
       "upload": "Uploaden"
@@ -6304,6 +6447,7 @@
       },
       "label-limit": "Limiet",
       "label-value": "Waarde",
+      "noOptionsMessage-no-fields-found": "",
       "scalar-options": {
         "description-clamped": "",
         "description-mod": "",
@@ -6312,9 +6456,15 @@
       }
     },
     "scale-dimension-editor": {
+      "fixed-value-option": {
+        "label": {
+          "fixed-value": ""
+        }
+      },
       "label-max": "Max.",
       "label-min": "Min.",
-      "label-value": "Waarde"
+      "label-value": "Waarde",
+      "noOptionsMessage-no-fields-found": ""
     },
     "text-dimension-editor": {
       "description-field": "",
@@ -6886,6 +7036,8 @@
       "aria-label-select-service-name-operator": "Servicenaam operator selecteren",
       "aria-label-select-span-name": "Selecteer een spannaam",
       "aria-label-select-span-name-operator": " Operator voor een spannaam selecteren",
+      "ariaLabel-select-max-span-duration": "",
+      "ariaLabel-select-min-span-duration": "",
       "label-collapse": "Spanfilters",
       "label-duration": "Duur",
       "label-service-name": "Servicenaam",
@@ -6956,6 +7108,8 @@
       "split-widen": "Deelvenster verbreden"
     },
     "trace-page-actions": {
+      "ariaLabel-copy-trace-id": "",
+      "ariaLabel-export-trace": "",
       "give-feedback": "Feedback geven",
       "label-copied": "Gekopieerd.",
       "label-export": "Exporteren",
@@ -7093,6 +7247,7 @@
   },
   "folder-filter": {
     "clear-folder-button": "Mappen wissen",
+    "noOptionsMessage-no-folders-found": "",
     "select-aria-label": "Mapfilter",
     "select-placeholder": "Filteren op map"
   },
@@ -7161,7 +7316,53 @@
     "incomplete-request-error": "Sorry, ik kon je verzoek niet voltooien. Probeer het opnieuw.",
     "send-custom-feedback": "Verzenden"
   },
+  "geo": {
+    "get-geometry-field": {
+      "warning-gazetteer-not-found": "",
+      "warning-no-geometry": "",
+      "warning-select-geohash": "",
+      "warning-select-lat-long": "",
+      "warning-select-lookup": "",
+      "warning-unable-to-find": ""
+    },
+    "location-editor": {
+      "geohash-field": {
+        "no-fields-message": ""
+      },
+      "latitude-field": {
+        "no-fields-message": ""
+      },
+      "longitude-field": {
+        "no-fields-message": ""
+      },
+      "lookup-field": {
+        "no-fields-message": ""
+      },
+      "name-gazetteer": "",
+      "name-geohash-field": "",
+      "name-latitude-field": "",
+      "name-location-mode": "",
+      "name-longitude-field": "",
+      "name-lookup-field": ""
+    },
+    "location-more-editor": {
+      "mode-options": {
+        "description-auto": "",
+        "description-coords": "",
+        "description-geohash": "",
+        "description-lookup": "",
+        "label-auto": "",
+        "label-coords": "",
+        "label-geohash": "",
+        "label-lookup": ""
+      }
+    }
+  },
   "geomap": {
+    "category-basemap-layer": "",
+    "category-map-controls": "",
+    "category-map-layers": "",
+    "category-map-view": "",
     "coordinates-map-view-editor": {
       "label-latitude": "Breedtegraad",
       "label-longitude": "Lengtegraad"
@@ -7170,6 +7371,14 @@
       "center": "Midden:",
       "zoom": "Zoom:"
     },
+    "description-initial-view": "",
+    "description-mouse-wheel-zoom": "",
+    "description-share-view": "",
+    "description-show-attribution": "",
+    "description-show-debug": "",
+    "description-show-measure": "",
+    "description-show-scale": "",
+    "description-show-zoom": "",
     "fit-map-view-editor": {
       "all-layers-editor-fragment": {
         "label-layer": "Laag"
@@ -7192,6 +7401,14 @@
     "geomap-style-rules-editor": {
       "aria-label-add-geomap-style-rule": "Geomap-stijlregel toevoegen"
     },
+    "layer-editor": {
+      "category-base-layer": "",
+      "description-display-tooltip": "",
+      "name-data": "",
+      "name-display-tooltip": "",
+      "name-layer-type": "",
+      "name-opacity": ""
+    },
     "layers-editor": {
       "label-add-layer": "Laag toevoegen",
       "no-layers": "Geen lagen?"
@@ -7202,16 +7419,38 @@
       "label-zoom": "Inzoomen",
       "use-current-map-settings": "Huidige kaartinstellingen gebruiken"
     },
+    "markers-layer": {
+      "description-show-legend": "",
+      "name-show-legend": "",
+      "name-styles": ""
+    },
     "markers-legend": {
       "title-symbol": "Symbool"
     },
     "measure-overlay": {
       "tooltip-show-measure-tools": "Meetinstrumenten weergeven"
     },
+    "name-initial-view": "",
+    "name-mouse-wheel-zoom": "",
+    "name-share-view": "",
+    "name-show-attribution": "",
+    "name-show-debug": "",
+    "name-show-measure": "",
+    "name-show-scale": "",
+    "name-show-zoom": "",
+    "name-tooltip": "",
+    "photos-layer": {
+      "noFieldsMessage-no-string-fields": ""
+    },
     "plugin": {
       "basemap-layer-configured-server-admin": "De basiskaartlaag wordt geconfigureerd door de serverbeheerder."
     },
     "style-editor": {
+      "horizontal-align-options": {
+        "label-center": "",
+        "label-left": "",
+        "label-right": ""
+      },
       "label-align": "Uitlijning",
       "label-baseline": "Uitgangswaarde",
       "label-color": "Kleur",
@@ -7225,7 +7464,14 @@
       "label-symbol-vertical-align": "Symbool verticaal uitlijnen",
       "label-text-label": "Labeltekst",
       "label-x-offset": "X offset",
-      "label-y-offset": "Y offset"
+      "label-y-offset": "Y offset",
+      "placeholderText-select-symbol": "",
+      "placeholderText-select-symbol-or-add-text": "",
+      "vertical-align-options": {
+        "label-bottom": "",
+        "label-center": "",
+        "label-top": ""
+      }
     },
     "style-rule-editor": {
       "aria-label-comparison-operator": "Vergelijkingsoperator",
@@ -7236,6 +7482,15 @@
       "placeholder-feature-property": "Eigenschap uitlichten",
       "placeholder-numeric-value": "Numerieke waarde",
       "placeholder-value": "waarde"
+    },
+    "tooltip-options": {
+      "description-details": "",
+      "description-none": "",
+      "label-details": "",
+      "label-none": ""
+    },
+    "utils": {
+      "get-next-layer-name": ""
     }
   },
   "get-enterprise": {
@@ -7485,7 +7740,8 @@
       "aria-label-selected-color": "Kleur {{colorLabel}}"
     },
     "confirm-button": {
-      "cancel": "Annuleren"
+      "cancel": "Annuleren",
+      "confirmText-delete": ""
     },
     "confirm-content": {
       "placeholder": "Type '{{confirmPromptText}}' om te bevestigen"
@@ -7667,6 +7923,8 @@
     },
     "panel-chrome": {
       "aria-label-toggle-collapse": "paneel in-/uitklappen",
+      "ariaLabel-panel-loading": "",
+      "ariaLabel-panel-status": "",
       "tooltip-cancel": "Query annuleren",
       "tooltip-cancel-loading": "Query annuleren",
       "tooltip-stop-streaming": "Streamen stoppen",
@@ -7834,6 +8092,12 @@
       "footer-click-to-action": "Klik om te {{actionTitle}}",
       "footer-click-to-navigate": "Klik om {{linkTitle}} te openen",
       "timestamp": "Tijdstempel"
+    },
+    "week-start-picker": {
+      "weekStarts-label-default": "",
+      "weekStarts-label-monday": "",
+      "weekStarts-label-saturday": "",
+      "weekStarts-label-sunday": ""
     }
   },
   "graph": {
@@ -8212,6 +8476,10 @@
     "add-library-panel-modal": {
       "title-create-library-panel": "Bibliotheekpaneel aanmaken"
     },
+    "change-library-panel-modal": {
+      "confirmText-change": "",
+      "confirmText-replace": ""
+    },
     "confirm": {
       "delete-panel": "Wil je dit paneel verwijderen?"
     },
@@ -8656,6 +8924,8 @@
       "updated-on": "Bijgewerkt op"
     },
     "snapshot-list-table": {
+      "body-delete": "",
+      "confirmText-delete": "",
       "title-delete": "Verwijderen"
     },
     "unthemed-dashboard-import": {
@@ -8667,6 +8937,9 @@
       }
     }
   },
+  "metric-select": {
+    "noOptionsMessage-no-options-found": ""
+  },
   "migrate-to-cloud": {
     "build-snapshot": {
       "description": "Deze tool kan sommige bronnen van deze installatie naar je cloudstack migreren. Om aan de slag te gaan, moet je een snapshot van deze installatie maken. Het maken van een snapshot duurt meestal minder dan twee minuten. De snapshot wordt naast deze Grafana-installatie opgeslagen.",
@@ -9365,7 +9638,7 @@
     "marker": {
       "100-node-count": ">100 knooppunten",
       "aria-label-hidden-marker": "Verborgen knooppuntenmarkering: {{marker}}",
-      "node-count_one": "{{count}} knooppunt",
+      "node-count_one": "{{count}} knooppunten",
       "node-count_other": "{{count}} knooppunten"
     },
     "node": {
@@ -9376,9 +9649,9 @@
       "aria-label-nodes-hidden-warning": "Waarschuwing verborgen knooppunten",
       "computing-layout": "Indeling berekenen",
       "no-data": "Geen gegevens",
-      "hidden-nodes_one": "<0></0> {{count}} knooppunt is verborgen om prestatieredenen.",
+      "hidden-nodes_one": "<0></0> {{count}} knooppunten zijn verborgen om prestatieredenen.",
       "hidden-nodes_other": "<0></0> {{count}} knooppunten zijn verborgen om prestatieredenen.",
-      "processed-nodes_one": "<0></0> Gelaagde indeling kan traag zijn met {{count}} knooppunt.",
+      "processed-nodes_one": "<0></0> Gelaagde indeling kan traag zijn met {{count}} knooppunten.",
       "processed-nodes_other": "<0></0> Gelaagde indeling kan traag zijn met {{count}} knooppunten."
     },
     "node-graph-panel": {
@@ -9505,6 +9778,7 @@
     }
   },
   "org-picker": {
+    "noOptionsMessage-no-organizations-found": "",
     "select-placeholder": "Organisatie selecteren"
   },
   "page": {
@@ -9727,6 +10001,7 @@
         "permission": "Je hebt geen toegangsrechten tot deze pagina.",
         "title-access-denied": "Toegang geweigerd"
       },
+      "error-loading-plugin": "",
       "no-root-app-page-component-found": "Geen paginacomponent voor hoofdapp gevonden"
     },
     "browse": {
@@ -9770,8 +10045,7 @@
         "update-status-text": "plug-ins zijn bijgewerkt"
       },
       "versions": {
-        "confirmation-text-1": "Weet je echt zeker dat je wilt downgraden naar versie",
-        "confirmation-text-2": "Normaal gesproken zou je dit niet moeten doen",
+        "confirmation-text": "",
         "downgrade-confirm": "Downgraden",
         "downgrade-title": "Plug-inversie downgraden"
       }
@@ -9825,6 +10099,10 @@
     "empty-state": {
       "message": "Geen plug-ins gevonden"
     },
+    "extensions": {
+      "extension-error-alert-description": "",
+      "extension-error-alert-title": ""
+    },
     "extensions-log-data-source": {
       "message": {
         "ok": "OK"
@@ -9858,7 +10136,11 @@
       "updating": "Updaten"
     },
     "install-controls-button": {
-      "title-uninstall-modal": "{{plugin}} verwijderen"
+      "title-uninstall-modal": "{{plugin}} verwijderen",
+      "uninstall-controls": {
+        "body-uninstall-plugin": "",
+        "confirmText-confirm": ""
+      }
     },
     "install-controls-warning": {
       "body-not-published": "Deze plug-in is niet gepubliceerd op <2>grafana.com/plugins</2> en kan niet via de catalogus worden beheerd.",
@@ -10894,6 +11176,7 @@
     }
   },
   "service-account-picker": {
+    "noOptionsMessage-no-service-accounts-found": "",
     "select-aria-label": "Serviceaccountkiezer",
     "select-placeholder": "Begin met typen om naar serviceaccounts te zoeken"
   },
@@ -10939,6 +11222,10 @@
     },
     "service-account-page-unconnected": {
       "add-service-account-token": "Serviceaccounttoken toevoegen",
+      "body-delete-service-account": "",
+      "body-disable-service-account": "",
+      "confirmText-delete-service-account": "",
+      "confirmText-disable-service-account": "",
       "delete-service-account": "Serviceaccount verwijderen",
       "disable-service-account": "Serviceaccount uitschakelen",
       "enable-service-account": "Serviceaccount inschakelen",
@@ -10965,6 +11252,7 @@
       "used-by": "Gebruikt door"
     },
     "service-account-profile-row": {
+      "confirmText-save": "",
       "edit": "Bewerken"
     },
     "service-account-role-row": {
@@ -10978,10 +11266,16 @@
     },
     "service-accounts-list-page-unconnected": {
       "add-service-account": "Serviceaccount toevoegen",
+      "body-delete-with-tokens": "",
+      "body-disable-service-account": "",
+      "confirmText-delete": "",
+      "confirmText-disable-service-account": "",
       "placeholder-search-service-account-by-name": "Serviceaccount zoeken op naam",
       "sub-title": "Serviceaccounts en hun tokens kunnen worden gebruikt om te verifiëren tegen de Grafana API. Lees meer in onze <2>documentatie</2>.</2>",
       "title-delete-service-account": "Serviceaccount verwijderen",
-      "title-disable-service-account": "Serviceaccount uitschakelen"
+      "title-disable-service-account": "Serviceaccount uitschakelen",
+      "body-delete_one": "",
+      "body-delete_other": ""
     },
     "token-expiration": {
       "content-this-token-has-expired": "Dit token is verlopen",
@@ -11373,7 +11667,7 @@
       "label-never": ""
     },
     "status-history-panel": {
-      "too-many-points_one": "Te veel punten om goed te visualiseren. <1></1>Werk de query bij om minder punten te retourneren. <3></3>({{count}} punt ontvangen)",
+      "too-many-points_one": "Te veel punten om goed te visualiseren. <1></1>Werk de query bij om minder punten te retourneren. <3></3>({{count}} punten ontvangen)",
       "too-many-points_other": "Te veel punten om goed te visualiseren. <1></1>Werk de query bij om minder punten te retourneren. <3></3>({{count}} punten ontvangen)"
     }
   },
@@ -11518,6 +11812,7 @@
     "tag-option-label": "Labeloptie"
   },
   "team-picker": {
+    "noOptionsMessage-no-teams-found": "",
     "select-aria-label": "Teamkiezer",
     "select-placeholder": "Selecteer een team"
   },
@@ -11843,6 +12138,7 @@
     "convert-field-type-transformer-editor": {
       "aria-label-add-a-convert-field-type-transformer": "Transformator omgezet veldtype toevoegen",
       "aria-label-remove-convert-field-type-transformer": "Transformator omgezet veldtype verwijderen",
+      "convert-field-type": "",
       "label": {
         "browser": "Browser",
         "utc": "UTC"
@@ -11885,6 +12181,11 @@
       "remove-enum-row-tooltip-delete": "Verwijderen"
     },
     "extract-fields-transformer-editor": {
+      "field-name-picker-settings": {
+        "placeholderText": {
+          "select-field": ""
+        }
+      },
       "label-delimiter": "Scheidingsteken",
       "label-format": "Formaat",
       "label-keep-time": "Tijd bijhouden",
@@ -11898,6 +12199,14 @@
       "aria-label-threshold-color": "Drempelkleur"
     },
     "field-lookup-transformer-editor": {
+      "field-name-picker-settings": {
+        "noFieldsMessage": {
+          "no-text-fields-found": ""
+        },
+        "placeholderText": {
+          "select-text-field": ""
+        }
+      },
       "label-field": "Veld",
       "label-lookup": "Opzoeken"
     },
@@ -11923,10 +12232,30 @@
     },
     "filter-by-value-transformer-editor": {
       "add-condition": "Voorwaarde toevoegen",
+      "filter-match": {
+        "label": {
+          "match-all": "",
+          "match-any": ""
+        }
+      },
+      "filter-types": {
+        "label": {
+          "exclude": "",
+          "include": ""
+        }
+      },
       "label-conditions": "Voorwaarden",
       "label-filter-type": "Type filteren"
     },
     "format-string-transfomer-editor": {
+      "field-name-picker-settings": {
+        "noFieldsMessage": {
+          "no-text-fields-found": ""
+        },
+        "placeholderText": {
+          "select-text-field": ""
+        }
+      },
       "label-field": "Veld",
       "label-format": "Formaat",
       "label-substring-range": "Tekenreeksbereik"
@@ -12237,6 +12566,7 @@
     "title": "Organisaties"
   },
   "user-picker": {
+    "noOptionsMessage-no-users-found": "",
     "select-aria-label": "Gebruikerskiezer",
     "select-placeholder": "Begin te typen om te zoeken naar gebruiker"
   },
@@ -12322,6 +12652,8 @@
       }
     },
     "confirm-delete-modal": {
+      "body-delete-variable": "",
+      "confirmText-delete": "",
       "title-delete-variable": "Variabele verwijderen"
     },
     "create-ad-hoc-variable-adapter": {
@@ -12370,9 +12702,24 @@
       "label-refresh": "Vernieuwen"
     },
     "query-variable-sort-select": {
-      "description-values-variable": "De waarden van deze variabele sorteren"
+      "description-values-variable": "De waarden van deze variabele sorteren",
+      "name-sort": "",
+      "sort_options": {
+        "label": {
+          "alphabetical-asc": "",
+          "alphabetical-caseinsensitive-asc": "",
+          "alphabetical-caseinsensitive-desc": "",
+          "alphabetical-desc": "",
+          "disabled": "",
+          "natural-asc": "",
+          "natural-desc": "",
+          "numerical-asc": "",
+          "numerical-desc": ""
+        }
+      }
     },
     "text-box-variable-editor": {
+      "name-default-value": "",
       "placeholder-default-value-if-any": "standaardwaarde, indien aanwezig",
       "text-options": "Tekstopties"
     },
@@ -12401,6 +12748,8 @@
       "description-optional-display-name": "Optionele weergavenaam",
       "description-template-variable-characters": "De naam van de sjabloonvariabele. (Max. 50 tekens)",
       "general": "Algemeen",
+      "name-label": "",
+      "name-name": "",
       "placeholder-descriptive-text": "Omschrijving",
       "placeholder-label-name": "Labelnaam",
       "placeholder-variable-name": "Naam variabele",
@@ -12415,9 +12764,15 @@
       "tooltip-duplicate-variable": "Variabele dupliceren",
       "tooltip-remove-variable": "Variabele verwijderen"
     },
+    "variable-editor-un-connected": {
+      "name-description": ""
+    },
     "variable-options": {
       "aria-label-toggle-all-values": "Alle waarden in-/uitschakelen"
     },
+    "variable-type-select": {
+      "name-select-variable-type": ""
+    },
     "variable-usages-button": {
       "tooltip-show-usages": "Gebruik weergeven"
     },
diff --git a/public/locales/pl-PL/grafana.json b/public/locales/pl-PL/grafana.json
index b4d18b3c136..64f0653bbb3 100644
--- a/public/locales/pl-PL/grafana.json
+++ b/public/locales/pl-PL/grafana.json
@@ -84,6 +84,7 @@
     "admin-feature-toggles-table": {
       "confirm-modal-body-1": "Niektóre funkcje są stabilne (GA) i domyślnie włączone, podczas gdy inne są obecnie we wstępnej fazie beta i dostępne do wczesnego wdrożenia.",
       "confirm-modal-body-2": "Przed wprowadzeniem modyfikacji zalecamy przeanalizowanie konsekwencji każdej zmiany funkcji.",
+      "confirmText-save-changes": "",
       "get-stage-cell": {
         "beta": "Beta",
         "content-general-availability": "Ogólna dostępność",
@@ -96,14 +97,21 @@
     },
     "admin-orgs-table": {
       "aria-label-delete-org": "Usuń organizację",
+      "confirmText-delete": "",
       "title-delete": "Usuń"
     },
     "anon-users": {
       "not-found": "Nie znaleziono użytkowników anonimowych."
     },
     "base-user-sessions": {
+      "body-force-logout-from-all-devices": "",
+      "confirmText-confirm-logout": "",
+      "confirmText-force-logout": "",
       "title-force-logout-from-all-devices": "Wymuś wylogowanie ze wszystkich urządzeń"
     },
+    "change-org-button": {
+      "confirmText-save": ""
+    },
     "edit-org": {
       "access-denied": "Nie masz uprawnień do wyświetlania użytkowników w tej organizacji. Aby zaktualizować tę organizację, skontaktuj się z administratorem serwera.",
       "heading": "Edytuj organizację",
@@ -208,9 +216,11 @@
       "not-editable": "Nie można edytować roli tego użytkownika, ponieważ synchronizuje ją dostawca autoryzacji. Szczegółowe informacje znajdziesz w <1> dokumentach uwierzytelniających usługi Grafana</1>."
     },
     "org-users-table": {
+      "body-delete": "",
       "columns": {
         "aria-label-role": "Rola"
       },
+      "confirmText-delete": "",
       "delete-aria-label": "Usuń użytkownika: {{name}}",
       "title-delete": "Usuń"
     },
@@ -241,6 +251,9 @@
     "settings": {
       "info-description": "Te ustawienia systemowe są zdefiniowane w pliku grafana.ini lub custom.ini (lub nadpisane w zmiennych ENV). Aby je zmienić, obecnie należy ponownie uruchomić usługę Grafana."
     },
+    "un-themed-org-row": {
+      "confirmText-confirm-removal": ""
+    },
     "upgrade-info": {
       "title": "Licencja Enterprise"
     },
@@ -293,12 +306,17 @@
     },
     "user-permissions": {
       "change-button": "Zmień",
+      "confirmText-change": "",
       "grafana-admin-key": "Administrator usługi Grafana",
       "grafana-admin-no": "Nie",
       "grafana-admin-yes": "Tak",
       "title": "Uprawnienia"
     },
     "user-profile": {
+      "body-delete": "",
+      "body-disable": "",
+      "confirmText-delete-user": "",
+      "confirmText-disable-user": "",
       "delete-button": "Usuń użytkownika",
       "disable-button": "Wyłącz użytkownika",
       "edit-button": "Edytuj",
@@ -312,6 +330,9 @@
       "title-delete-user": "Usuń użytkownika",
       "title-disable-user": "Wyłącz użytkownika"
     },
+    "user-profile-row": {
+      "confirmText-save": ""
+    },
     "user-sessions": {
       "browser-column": "Przeglądarka i system operacyjny",
       "force-logout-all-button": "Wymuś wylogowanie ze wszystkich urządzeń",
@@ -469,6 +490,9 @@
       "label-muting-grouping-and-timings-optional": "Wyciszanie, grupowanie i harmonogramy (opcjonalnie)",
       "title-muting-grouping-and-timings": "Wyciszanie, grupowanie i harmonogramy"
     },
+    "alert-manager-picker": {
+      "noOptionsMessage-no-datasources-found": ""
+    },
     "alert-menu": {
       "copy-link": "Kopiuj link",
       "duplicate": "Duplikuj",
@@ -558,6 +582,7 @@
       "view-configuration": "Wyświetl konfigurację"
     },
     "alertmanager-config": {
+      "confirmText-yes-reset-configuration": "",
       "gma-manual-configuration-description": "Nie można ręcznie zmienić wewnętrznej konfiguracji menedżera alertów Grafany. Aby zmienić tę konfigurację, edytuj poszczególne zasoby z poziomu interfejsu użytkownika.",
       "gma-manual-configuration-is-not-supported": "Ręczne zmiany konfiguracji nie są obsługiwane",
       "message": {
@@ -572,11 +597,13 @@
       "title-resetting-alertmanager-configuration": "Resetowanie konfiguracji menedżera alertów"
     },
     "alertmanager-configuration-version-manager": {
+      "body-restore-configuration-version-unsaved-changes": "",
       "columns": {
         "compare": "Porównaj",
         "restore": "Przywróć",
         "text-latest": "Najnowsze"
       },
+      "confirmText-yes-restore-configuration": "",
       "loading": "Ładowanie…",
       "no-previous-configurations": "Brak wcześniejszych konfiguracji",
       "this-might-take-a-while": "Może to chwilę potrwać…",
@@ -856,8 +883,10 @@
     },
     "contact-point-header": {
       "aria-label-more-actions": "Więcej działań dla punktu kontaktu „{{contactPointName}}”",
+      "ariaLabel-delete": "",
       "button-edit": "Edytuj",
       "button-view": "Wyświetl",
+      "export-ariaLabel-export": "",
       "export-label-export": "Eksport",
       "label-delete": "Usuń",
       "label-manage-permissions": "Zarządzaj uprawnieniami",
@@ -1396,6 +1425,7 @@
       "label-disable-resolved-message": "Wyłącz rozwiązaną wiadomość"
     },
     "grafana-evaluation-behavior-step": {
+      "loadingMessage-loading-groups": "",
       "message": {
         "must-be-a-positive-integer": "Musi to być dodatnia liczba całkowita.",
         "must-enter-a-group-name": "Należy podać nazwę grupy"
@@ -1856,7 +1886,11 @@
             "other-data-sources": "Inne źródła danych"
           }
         }
-      }
+      },
+      "noOptionsMessage-no-datasources-found": ""
+    },
+    "mute-timing-actions-button": {
+      "body-delete-mute-timing": ""
     },
     "mute-timing-actions-buttons": {
       "text-disabled": "Wyłączone",
@@ -2109,9 +2143,11 @@
       "update-errors": {
         "conflict": "Inny użytkownik zaktualizował drzewo zbiorów zasad dot. powiadamiania.",
         "error-code": "Komunikat o błędzie: „{{error}}”",
-        "fallback": "Błąd podczas aktualizowania Twoich zasad powiadomień.",
+        "routes": {
+          "conflictingMatchers": ""
+        },
         "suffix": "Odśwież stronę i spróbuj ponownie.",
-        "title": "Błąd podczas zapisywania zasad dot. powiadomień"
+        "title": ""
       },
       "n-more-policies_one": "{{count}} dodatkowy zbiór zasad",
       "n-more-policies_few": "{{count}} dodatkowe zbiory zasad",
@@ -2169,6 +2205,7 @@
     "query-and-expressions-step": {
       "add-query": "Dodaj zapytanie",
       "body-queries-expressions-configured": "Utwórz co najmniej jedno zapytanie lub wyrażenie, które będzie powodować wyświetlenie alertu",
+      "confirmText-deactivate": "",
       "expressions": "Wyrażenia",
       "loading-data-sources": "Wczytywanie źródeł danych…",
       "manipulate-returned-queries-other-operations": "Manipulowanie danymi zwracanymi z zapytań za pomocą działań matematycznych i innych operacji.",
@@ -2236,6 +2273,7 @@
     "redirect-to-clone-rule": {
       "body-evaluation-group": "Konieczne będzie ustawienie nowej grupy oceny dla skopiowanej reguły, ponieważ oryginalna grupa została aprowizowana i nie można jej użyć w przypadku reguł utworzonych w interfejsie użytkownika.",
       "body-not-provisioned": "Nowa reguła <1>nie</1> zostanie oznaczona jako reguła po aprowizacji.",
+      "confirmText-copy": "",
       "title-copy-provisioned-alert-rule": "Kopiuj regułę aprowizowanego alertu"
     },
     "redirect-to-rule-viewer": {
@@ -2435,8 +2473,6 @@
       "title-inspect-alert-rule": "Zbadaj regułę alertu"
     },
     "rule-list": {
-      "cannot-find-rule-details-for": "Nie można znaleźć szczegółów reguły dla identyfikatora {{uid}}",
-      "cannot-load-rule-details-for": "Nie można załadować szczegółów reguły dla UID {{uid}}",
       "configure-datasource": "Konfiguruj",
       "draft-new-rule": "Zaprojektuj nową regułę",
       "ds-error": {
@@ -2792,6 +2828,9 @@
       "existing-templates-selector-placeholder-choose-notification-template": "Wybierz szablon powiadomienia",
       "loading": "Ładowanie…",
       "template-options": {
+        "ariaLabel": {
+          "select-notification-template": ""
+        },
         "label": {
           "select-notification-template": "Wybierz szablon powiadomienia"
         }
@@ -2818,6 +2857,8 @@
     },
     "templates-table": {
       "actions": "Działania",
+      "body-delete-template-group": "",
+      "confirmText-yes-delete": "",
       "no-templates-defined": "Nie zdefiniowano szablonów.",
       "template-group": "Grupa szablonów",
       "title-delete-template-group": "Usuń grupę szablonów"
@@ -2945,6 +2986,11 @@
         "title-delete-contact-point": "Usuń punkt kontaktu"
       }
     },
+    "use-delete-modal": {
+      "modal": {
+        "confirmText-yes-delete": ""
+      }
+    },
     "use-delete-policy-modal": {
       "modal-element": {
         "title-delete-notification-policy": "Usuń zasady dotyczące powiadomień"
@@ -3101,7 +3147,8 @@
     "annotation-field-mapper": {
       "annotation": "Adnotacja",
       "first-value": "Pierwsza wartość",
-      "from": ""
+      "from": "",
+      "noOptionsMessage-unknown-field-names": ""
     },
     "empty-state": {
       "button-title": "Dodaj zapytanie do komentarza",
@@ -3235,7 +3282,7 @@
       "team-ids-github": "Lista identyfikatorów zespołów w postaci liczb całkowitych.",
       "team-ids-label": "Identyfikatory zespołów",
       "team-ids-numbers": "Identyfikatory zespołów muszą być liczbami.",
-      "team-ids-other": "Lista identyfikatorów zespołów w postaci ciągów.",
+      "team-ids-other": "",
       "team-ids-placeholder": "Wprowadź identyfikatory zespołów i naciśnij klawisz Enter, aby je dodać",
       "teams-url-description": "Adres URL używany do wyszukiwania identyfikatorów zespołów. Jeśli nie jest ustawiony, wartością domyślną jest /teams.",
       "teams-url-description-oauth": "Jeśli skonfigurujesz „{{ teamsURLLabel }}”, musisz również skonfigurować „{{ teamIDsAttributePathLabel }}”.",
@@ -3279,6 +3326,7 @@
       "additional-actions-menu": {
         "label-reset-to-default-values": "Zresetuj do wartości domyślnych"
       },
+      "confirmText-reset": "",
       "disable": "Wyłącz",
       "disabling": "Wyłączanie…",
       "discard": "Odrzuć",
@@ -4216,8 +4264,8 @@
     }
   },
   "dashbaord-scene": {
-    "interval-variable-form": {
-      "description-auto-option": "Dynamicznie oblicza odstęp czasu, dzieląc zakres przez określoną liczbę"
+    "variable-editor-form": {
+      "run-query": ""
     }
   },
   "dashboard": {
@@ -4379,6 +4427,9 @@
     },
     "dash-nav": {
       "on-open-snapshot-original": {
+        "confirmText": {
+          "proceed": ""
+        },
         "title": {
           "proceed-to-external-site": "Przejść do witryny zewnętrznej?"
         }
@@ -4593,6 +4644,13 @@
           "editable": "Możliwość edycji",
           "readonly": "Tylko do odczytu"
         }
+      },
+      "graph_tooltip_options": {
+        "label": {
+          "default": "",
+          "shared-crosshair": "",
+          "shared-tooltip": ""
+        }
       }
     },
     "get-debug-dashboard": {
@@ -4899,6 +4957,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "Czy na pewno chcesz przywrócić pulpit w wersji {{version}}? Wszystkie niezapisane zmiany zostaną utracone.",
+      "confirmText-restore-version": "",
       "title-restore-version": "Przywróć wersję"
     },
     "row-options-button": {
@@ -4949,6 +5008,9 @@
         "title-not-unique": "Ten tytuł nie jest unikalny"
       }
     },
+    "save-dashboard": {
+      "message-dashboard-saved": ""
+    },
     "save-dashboard-as-button": {
       "save-as": "Zapisz jako"
     },
@@ -4983,6 +5045,7 @@
     "save-dashboard-error-proxy": {
       "body-name-exists": "W wybranym folderze istnieje już pulpit o tej samej nazwie.<1></1><2>Czy nadal chcesz zapisać ten pulpit?</2>",
       "body-version-mismatch": "Ktoś inny zaktualizował ten pulpit<1></1><2>Czy nadal chcesz zapisać ten pulpit?</2>",
+      "confirmText-save-and-overwrite": "",
       "title-name-exists": "Konflikt",
       "title-version-mismatch": "Konflikt"
     },
@@ -5179,7 +5242,9 @@
       "label-apply-transformation-to": "Zastosuj transformację do"
     },
     "transformation-operation-row": {
+      "body-delete": "",
       "render-actions": {
+        "confirmText-delete": "",
         "title-debug": "Debugowanie",
         "title-disable-transformation": "Wyłącz transformację",
         "title-filter": "Filtr",
@@ -5201,10 +5266,14 @@
       "show-images": "Pokaż obrazki",
       "title-add-another-transformation": "Dodaj inną transformację"
     },
+    "un-theme-transformations-editor": {
+      "body-delete-all-transformations": ""
+    },
     "un-themed-transformations-editor": {
       "actions": {
         "add-another-transformation": "Dodaj inną transformację"
       },
+      "confirmText-delete-all": "",
       "delete-all-transformations": "Usuń wszystkie transformacje",
       "title-delete-all-transformations": "Usunąć wszystkie transformacje?",
       "tooltip-clear-search": "Wyczyść wyszukiwanie",
@@ -5241,6 +5310,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "Przełącz wybór wersji {{version}}",
       "date": "Data",
+      "name-latest": "",
       "notes": "Uwagi",
       "restore": "Przywróć",
       "updated-by": "Zaktualizowane przez",
@@ -5317,7 +5387,8 @@
       "description-enables-users-custom-values": "Umożliwia użytkownikom dodawanie niestandardowych wartości do listy",
       "description-provide-dimensions-as-csv-dimension-name-dimension-id": "Podaj wymiary jako wartości rozdzielone przecinkami: {{name}}, {{value}}",
       "label-data-source": "Źródło danych",
-      "label-use-static-key-dimensions": "Użyj statycznych wymiarów klucza"
+      "label-use-static-key-dimensions": "Użyj statycznych wymiarów klucza",
+      "name-allow-custom-values": ""
     },
     "add-to-dashboard": {
       "message": {
@@ -5390,6 +5461,9 @@
       }
     },
     "config-public-dashboard": {
+      "confirmText": {
+        "revoke-public-url": ""
+      },
       "title": {
         "revoke-public-url": "Cofnij upublicznienie URL"
       }
@@ -5401,6 +5475,7 @@
     },
     "custom-variable-form": {
       "custom-options": "Opcje niestandardowe",
+      "name-values-separated-comma": "",
       "selection-options": "Opcje wyboru"
     },
     "dashboard-edit-pane-renderer": {
@@ -5419,6 +5494,12 @@
       "label-type": "Typ",
       "label-url": "URL",
       "label-with-tags": "Z tagami",
+      "link-type-options": {
+        "label": {
+          "dashboards": "",
+          "link": ""
+        }
+      },
       "placeholder-open-dashboard": "Otwórz pulpit"
     },
     "dashboard-link-list": {
@@ -5465,6 +5546,8 @@
       "data-source-options": "Opcje źródła danych",
       "description-instance-name-filter": "Filtr wyrażeń regularnych, w przypadku których instancje źródeł danych należy wybrać z listy wartości zmiennych. Pozostaw puste dla wszystkich.",
       "example-instance-name-filter": "Przykład: <codeExample />",
+      "name-instance-name-filter": "",
+      "name-type": "",
       "selection-options": "Opcje wyboru"
     },
     "default-grid-layout-manager": {
@@ -5510,6 +5593,21 @@
     "empty-transformations-message": {
       "add-transformation": "Dodaj transformację"
     },
+    "general-settings-edit-view": {
+      "editable_options": {
+        "label": {
+          "editable": "",
+          "readonly": ""
+        }
+      },
+      "graph_tooltip_options": {
+        "label": {
+          "default": "",
+          "shared-crosshair": "",
+          "shared-tooltip": ""
+        }
+      }
+    },
     "get-edit-options": {
       "title": {
         "column-options": "Opcje kolumn",
@@ -5540,7 +5638,8 @@
       "description-provide-dimensions-as-csv-dimension-name-dimension-id": "Podaj wymiary jako wartości rozdzielone przecinkami: {{name}}, {{value}}",
       "group-by-options": "Grupuj według opcji",
       "label-data-source": "Źródło danych",
-      "label-use-static-group-by-dimensions": "Użyj statycznych wymiarów grupy"
+      "label-use-static-group-by-dimensions": "Użyj statycznych wymiarów grupy",
+      "name-allow-custom-values": ""
     },
     "help-wizard": {
       "copy-to-clipboard": "Kopiuj do schowka",
@@ -5576,9 +5675,14 @@
       "apply": "Zastosuj"
     },
     "interval-variable-form": {
+      "description-auto-option": "",
       "description-calculated-value-below-threshold": "Obliczona wartość nie spadnie poniżej tego progu",
       "description-step-count": "Ile razy należy podzielić bieżący zakres czasu, aby obliczyć wartość",
-      "interval-options": "Opcje odstępu czasu"
+      "interval-options": "Opcje odstępu czasu",
+      "name-auto-option": "",
+      "name-min-interval": "",
+      "name-step-count": "",
+      "name-values": ""
     },
     "json-model-edit-view": {
       "cancel-button": {
@@ -5605,6 +5709,9 @@
       "title-name-already-exists": "Nazwa już istnieje"
     },
     "on-open-snapshot-original-dashboard": {
+      "confirmText": {
+        "proceed": ""
+      },
       "title": {
         "proceed-to-external-site": "Przejść do witryny zewnętrznej?"
       }
@@ -5640,6 +5747,8 @@
     },
     "panel-data-transformations-tab-rendered": {
       "add-another-transformation": "Dodaj inną transformację",
+      "body-delete-all-transformations": "",
+      "confirmText-delete-all": "",
       "delete-all-transformations": "Usuń wszystkie transformacje",
       "title-delete-all-transformations": "Usunąć wszystkie transformacje?"
     },
@@ -5693,6 +5802,7 @@
       "description-optional": "Opcjonalnie pozwalają wyodrębnić część nazwy serii lub segmentu węzła metryki.",
       "label-data-source": "Źródło danych",
       "label-target-data-source": "Docelowe źródło danych",
+      "name-regex": "",
       "query-options": "Opcje zapytania",
       "selection-options": "Opcje wyboru"
     },
@@ -5707,6 +5817,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "Czy na pewno chcesz przywrócić pulpit w wersji {{version}}? Wszystkie niezapisane zmiany zostaną utracone.",
+      "confirmText-restore-version": "",
       "title-restore-version": "Przywróć wersję"
     },
     "save-button": {
@@ -5802,7 +5913,11 @@
     "selection-options-form": {
       "description-enables-multiple-values-selected": "Umożliwia wybór wielu wartości jednocześnie",
       "description-enables-option-include-variables": "Włącza opcję uwzględniania wszystkich wartości",
-      "description-enables-users-custom-values": "Umożliwia użytkownikom dodawanie niestandardowych wartości do listy"
+      "description-enables-users-custom-values": "Umożliwia użytkownikom dodawanie niestandardowych wartości do listy",
+      "name-allow-custom-values": "",
+      "name-custom-all-value": "",
+      "name-include-all-option": "",
+      "name-multi-value": ""
     },
     "share-button": {
       "aria-label-sharedropdownmenu": "Przełącz menu udostępniania"
@@ -5822,6 +5937,9 @@
         "copy-to-clipboard-failed": "Nie udało się skopiować do schowka"
       }
     },
+    "text-box-variable": {
+      "name-default-value": ""
+    },
     "text-box-variable-form": {
       "placeholder-default-value-if-any": "(opcjonalnie)",
       "text-options": "Opcje tekstu"
@@ -5845,6 +5963,8 @@
       }
     },
     "unlink-modal": {
+      "body-unlink-panel": "",
+      "confirmText-yes-unlink": "",
       "title-really-unlink-panel": "Czy na pewno chcesz odłączyć ten panel?"
     },
     "unsaved-changes-modal": {
@@ -5861,6 +5981,9 @@
         }
       }
     },
+    "use-save-dashboard": {
+      "message-dashboard-saved": ""
+    },
     "variable-check-indicator": {
       "aria-label-variable-referenced-dashboard": "Do tej zmiennej nie odwołuje się żadna zmienna ani pulpit.",
       "aria-label-variable-referenced-other-variables-dashboard": "Do tej zmiennej odwołują się inne zmienne lub pulpit.",
@@ -5870,10 +5993,16 @@
     "variable-editor-form": {
       "aria-label-variable-editor-form": "Formularz edytora zmiennych",
       "back-to-list": "Powrót do listy",
+      "confirmText": {
+        "delete-variable": ""
+      },
       "delete": "Usuń",
       "description-optional-display-name": "Opcjonalna nazwa wyświetlana",
       "description-template-variable-characters": "Nazwa zmiennej szablonu. (maks. 50 znaków)",
       "general": "Ogólne",
+      "name-description": "",
+      "name-label": "",
+      "name-name": "",
       "placeholder-descriptive-text": "Tekst opisowy",
       "placeholder-label-name": "Nazwa etykiety",
       "placeholder-variable-name": "Nazwa zmiennej",
@@ -5888,13 +6017,25 @@
       "variable": "Zmienna"
     },
     "variable-editor-list-row": {
+      "body-delete-variable": "",
+      "confirmText-delete-variable": "",
       "title-delete-variable": "Usuń zmienną",
       "tooltip-duplicate-variable": "Duplikuj zmienną",
       "tooltip-remove-variable": "Usuń zmienną"
     },
     "variable-hide-select": {
+      "hide_options": {
+        "label": {
+          "label": "",
+          "nothing": "",
+          "variable": ""
+        }
+      },
       "label": "Ukryj"
     },
+    "variable-type-select": {
+      "name-variable-type": ""
+    },
     "variable-usages-button": {
       "title-show-usages": "Pokazuje użycie dla: {{variableId}}",
       "tooltip-show-usages": "Wyświetl użycie"
@@ -5921,6 +6062,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "Przełącz wybór wersji {{version}}",
       "date": "Data",
+      "name-latest": "",
       "notes": "Uwagi",
       "restore": "Przywróć",
       "updated-by": "Zaktualizowane przez",
@@ -6308,7 +6450,8 @@
       }
     },
     "color-dimension-editor": {
-      "label-fixed-color": ""
+      "label-fixed-color": "",
+      "noOptionsMessage-no-fields-found": ""
     },
     "file-dropzone-custom-children": {
       "upload": "Prześlij"
@@ -6346,6 +6489,7 @@
       },
       "label-limit": "Limit",
       "label-value": "Wartość",
+      "noOptionsMessage-no-fields-found": "",
       "scalar-options": {
         "description-clamped": "",
         "description-mod": "",
@@ -6354,9 +6498,15 @@
       }
     },
     "scale-dimension-editor": {
+      "fixed-value-option": {
+        "label": {
+          "fixed-value": ""
+        }
+      },
       "label-max": "Maks.",
       "label-min": "Min.",
-      "label-value": "Wartość"
+      "label-value": "Wartość",
+      "noOptionsMessage-no-fields-found": ""
     },
     "text-dimension-editor": {
       "description-field": "",
@@ -6928,6 +7078,8 @@
       "aria-label-select-service-name-operator": "Wybierz operator nazwy usługi",
       "aria-label-select-span-name": "Wybierz nazwę zakresu",
       "aria-label-select-span-name-operator": "Wybierz operator nazwy zakresu",
+      "ariaLabel-select-max-span-duration": "",
+      "ariaLabel-select-min-span-duration": "",
       "label-collapse": "Filtry zakresu",
       "label-duration": "Czas trwania",
       "label-service-name": "Nazwa usługi",
@@ -6998,6 +7150,8 @@
       "split-widen": "Poszerz okno"
     },
     "trace-page-actions": {
+      "ariaLabel-copy-trace-id": "",
+      "ariaLabel-export-trace": "",
       "give-feedback": "Przekaż opinię",
       "label-copied": "Skopiowano",
       "label-export": "Eksport",
@@ -7135,6 +7289,7 @@
   },
   "folder-filter": {
     "clear-folder-button": "Wyczyść foldery",
+    "noOptionsMessage-no-folders-found": "",
     "select-aria-label": "Filtr folderów",
     "select-placeholder": "Filtruj wg folderu"
   },
@@ -7203,7 +7358,53 @@
     "incomplete-request-error": "Nie udało nam się zrealizować Twojego żądania. Spróbuj ponownie.",
     "send-custom-feedback": "Wyślij"
   },
+  "geo": {
+    "get-geometry-field": {
+      "warning-gazetteer-not-found": "",
+      "warning-no-geometry": "",
+      "warning-select-geohash": "",
+      "warning-select-lat-long": "",
+      "warning-select-lookup": "",
+      "warning-unable-to-find": ""
+    },
+    "location-editor": {
+      "geohash-field": {
+        "no-fields-message": ""
+      },
+      "latitude-field": {
+        "no-fields-message": ""
+      },
+      "longitude-field": {
+        "no-fields-message": ""
+      },
+      "lookup-field": {
+        "no-fields-message": ""
+      },
+      "name-gazetteer": "",
+      "name-geohash-field": "",
+      "name-latitude-field": "",
+      "name-location-mode": "",
+      "name-longitude-field": "",
+      "name-lookup-field": ""
+    },
+    "location-more-editor": {
+      "mode-options": {
+        "description-auto": "",
+        "description-coords": "",
+        "description-geohash": "",
+        "description-lookup": "",
+        "label-auto": "",
+        "label-coords": "",
+        "label-geohash": "",
+        "label-lookup": ""
+      }
+    }
+  },
   "geomap": {
+    "category-basemap-layer": "",
+    "category-map-controls": "",
+    "category-map-layers": "",
+    "category-map-view": "",
     "coordinates-map-view-editor": {
       "label-latitude": "Szerokość geograficzna",
       "label-longitude": "Długość geograficzna"
@@ -7212,6 +7413,14 @@
       "center": "Środek:",
       "zoom": "Powiększenie:"
     },
+    "description-initial-view": "",
+    "description-mouse-wheel-zoom": "",
+    "description-share-view": "",
+    "description-show-attribution": "",
+    "description-show-debug": "",
+    "description-show-measure": "",
+    "description-show-scale": "",
+    "description-show-zoom": "",
     "fit-map-view-editor": {
       "all-layers-editor-fragment": {
         "label-layer": "Warstwa"
@@ -7234,6 +7443,14 @@
     "geomap-style-rules-editor": {
       "aria-label-add-geomap-style-rule": "Dodaj regułę stylu geomapy"
     },
+    "layer-editor": {
+      "category-base-layer": "",
+      "description-display-tooltip": "",
+      "name-data": "",
+      "name-display-tooltip": "",
+      "name-layer-type": "",
+      "name-opacity": ""
+    },
     "layers-editor": {
       "label-add-layer": "Dodaj warstwę",
       "no-layers": "Brak warstw?"
@@ -7244,16 +7461,38 @@
       "label-zoom": "Powiększenie",
       "use-current-map-settings": "Użyj bieżących ustawień mapy"
     },
+    "markers-layer": {
+      "description-show-legend": "",
+      "name-show-legend": "",
+      "name-styles": ""
+    },
     "markers-legend": {
       "title-symbol": "Symbol"
     },
     "measure-overlay": {
       "tooltip-show-measure-tools": "Pokaż narzędzia pomiarowe"
     },
+    "name-initial-view": "",
+    "name-mouse-wheel-zoom": "",
+    "name-share-view": "",
+    "name-show-attribution": "",
+    "name-show-debug": "",
+    "name-show-measure": "",
+    "name-show-scale": "",
+    "name-show-zoom": "",
+    "name-tooltip": "",
+    "photos-layer": {
+      "noFieldsMessage-no-string-fields": ""
+    },
     "plugin": {
       "basemap-layer-configured-server-admin": "Warstwa mapy bazowej jest konfigurowana przez administratora serwera."
     },
     "style-editor": {
+      "horizontal-align-options": {
+        "label-center": "",
+        "label-left": "",
+        "label-right": ""
+      },
       "label-align": "Wyrównanie",
       "label-baseline": "Linia bazowa",
       "label-color": "Kolor",
@@ -7267,7 +7506,14 @@
       "label-symbol-vertical-align": "Wyrównanie symbolu w pionie",
       "label-text-label": "Etykieta tekstowa",
       "label-x-offset": "Przesunięcie względem osi X",
-      "label-y-offset": "Przesunięcie względem osi Y"
+      "label-y-offset": "Przesunięcie względem osi Y",
+      "placeholderText-select-symbol": "",
+      "placeholderText-select-symbol-or-add-text": "",
+      "vertical-align-options": {
+        "label-bottom": "",
+        "label-center": "",
+        "label-top": ""
+      }
     },
     "style-rule-editor": {
       "aria-label-comparison-operator": "Operator porównania",
@@ -7278,6 +7524,15 @@
       "placeholder-feature-property": "Właściwość funkcji",
       "placeholder-numeric-value": "Wartość numeryczna",
       "placeholder-value": "wartość"
+    },
+    "tooltip-options": {
+      "description-details": "",
+      "description-none": "",
+      "label-details": "",
+      "label-none": ""
+    },
+    "utils": {
+      "get-next-layer-name": ""
     }
   },
   "get-enterprise": {
@@ -7527,7 +7782,8 @@
       "aria-label-selected-color": "Kolor {{colorLabel}}"
     },
     "confirm-button": {
-      "cancel": "Anuluj"
+      "cancel": "Anuluj",
+      "confirmText-delete": ""
     },
     "confirm-content": {
       "placeholder": "Wpisz „{{confirmPromptText}}”, aby potwierdzić"
@@ -7709,6 +7965,8 @@
     },
     "panel-chrome": {
       "aria-label-toggle-collapse": "przełącznik zwinięcia panelu",
+      "ariaLabel-panel-loading": "",
+      "ariaLabel-panel-status": "",
       "tooltip-cancel": "Anuluj zapytanie",
       "tooltip-cancel-loading": "Anuluj zapytanie",
       "tooltip-stop-streaming": "Zatrzymaj strumieniowanie",
@@ -7876,6 +8134,12 @@
       "footer-click-to-action": "Kliknij, aby podjąć działanie: {{actionTitle}}",
       "footer-click-to-navigate": "Kliknij, aby otworzyć {{linkTitle}}",
       "timestamp": "Znacznik czasu"
+    },
+    "week-start-picker": {
+      "weekStarts-label-default": "",
+      "weekStarts-label-monday": "",
+      "weekStarts-label-saturday": "",
+      "weekStarts-label-sunday": ""
     }
   },
   "graph": {
@@ -8258,6 +8522,10 @@
     "add-library-panel-modal": {
       "title-create-library-panel": "Utwórz panel biblioteki"
     },
+    "change-library-panel-modal": {
+      "confirmText-change": "",
+      "confirmText-replace": ""
+    },
     "confirm": {
       "delete-panel": "Czy chcesz usunąć ten panel?"
     },
@@ -8708,6 +8976,8 @@
       "updated-on": "Data aktualizacji"
     },
     "snapshot-list-table": {
+      "body-delete": "",
+      "confirmText-delete": "",
       "title-delete": "Usuń"
     },
     "unthemed-dashboard-import": {
@@ -8719,6 +8989,9 @@
       }
     }
   },
+  "metric-select": {
+    "noOptionsMessage-no-options-found": ""
+  },
   "migrate-to-cloud": {
     "build-snapshot": {
       "description": "To narzędzie może migrować niektóre zasoby z tej instalacji do stosu w chmurze. Aby rozpocząć, musisz utworzyć migawkę tej instalacji. Utworzenie migawki zajmuje zwykle mniej niż dwie minuty. Migawka jest przechowywana obok instalacji Grafana.",
@@ -9417,7 +9690,7 @@
     "marker": {
       "100-node-count": ">100 węzłów",
       "aria-label-hidden-marker": "Znacznik ukrytych węzłów: {{marker}}",
-      "node-count_one": "{{count}} węzeł",
+      "node-count_one": "{{count}} węzła",
       "node-count_few": "{{count}} węzły",
       "node-count_many": "{{count}} węzłów",
       "node-count_other": "{{count}} węzła"
@@ -9430,13 +9703,13 @@
       "aria-label-nodes-hidden-warning": "Ostrzeżenie o ukrytych węzłach",
       "computing-layout": "Obliczanie układu",
       "no-data": "Brak danych",
-      "hidden-nodes_one": "<0></0> {{count}} węzeł jest ukryty ze względu na wydajność.",
+      "hidden-nodes_one": "<0></0> {{count}} węzła jest ukryte ze względu na wydajność.",
       "hidden-nodes_few": "<0></0> {{count}} węzły są ukryte ze względu na wydajność.",
       "hidden-nodes_many": "<0></0> {{count}} węzłów jest ukrytych ze względu na wydajność.",
       "hidden-nodes_other": "<0></0> {{count}} węzła jest ukryte ze względu na wydajność.",
-      "processed-nodes_one": "<0></0> Układ warstwowy może działać powoli w przypadku {{count}} węzła.",
+      "processed-nodes_one": "<0></0> Układ warstwowy może działać powoli w przypadku {{count}} węzła.",
       "processed-nodes_few": "<0></0> Układ warstwowy może działać powoli w przypadku {{count}} węzłów.",
-      "processed-nodes_many": "<0></0> Układ warstwowy może działać powoli w przypadku {{count}} węzłów.",
+      "processed-nodes_many": "<0></0> Układ warstwowy może działać powoli w przypadku {{count}} węzła.",
       "processed-nodes_other": "<0></0> Układ warstwowy może działać powoli w przypadku {{count}} węzła."
     },
     "node-graph-panel": {
@@ -9563,6 +9836,7 @@
     }
   },
   "org-picker": {
+    "noOptionsMessage-no-organizations-found": "",
     "select-placeholder": "Wybierz organizację"
   },
   "page": {
@@ -9785,6 +10059,7 @@
         "permission": "Nie masz uprawnień do wyświetlenia tej strony.",
         "title-access-denied": "Odmowa dostępu"
       },
+      "error-loading-plugin": "",
       "no-root-app-page-component-found": "Nie znaleziono komponentu strony głównej aplikacji"
     },
     "browse": {
@@ -9828,8 +10103,7 @@
         "update-status-text": "wtyczki są aktualne"
       },
       "versions": {
-        "confirmation-text-1": "Czy na pewno chcesz przejść na starszą wersję",
-        "confirmation-text-2": "To działanie nie jest zwykle zalecane",
+        "confirmation-text": "",
         "downgrade-confirm": "Przejście na starszą wersję",
         "downgrade-title": "Użyj starszej wersji wtyczki"
       }
@@ -9883,6 +10157,10 @@
     "empty-state": {
       "message": "Nie znaleziono wtyczek"
     },
+    "extensions": {
+      "extension-error-alert-description": "",
+      "extension-error-alert-title": ""
+    },
     "extensions-log-data-source": {
       "message": {
         "ok": "OK"
@@ -9916,7 +10194,11 @@
       "updating": "Aktualizowanie"
     },
     "install-controls-button": {
-      "title-uninstall-modal": "Odinstaluj wtyczkę {{plugin}}"
+      "title-uninstall-modal": "Odinstaluj wtyczkę {{plugin}}",
+      "uninstall-controls": {
+        "body-uninstall-plugin": "",
+        "confirmText-confirm": ""
+      }
     },
     "install-controls-warning": {
       "body-not-published": "Ta wtyczka nie została opublikowana na stronie <2>grafana.com/plugins</2> i nie można nią zarządzać za pośrednictwem katalogu.",
@@ -10962,6 +11244,7 @@
     }
   },
   "service-account-picker": {
+    "noOptionsMessage-no-service-accounts-found": "",
     "select-aria-label": "Selektor konta usługi",
     "select-placeholder": "Zacznij pisać, aby wyszukać konta usług"
   },
@@ -11007,6 +11290,10 @@
     },
     "service-account-page-unconnected": {
       "add-service-account-token": "Dodaj token konta usługi",
+      "body-delete-service-account": "",
+      "body-disable-service-account": "",
+      "confirmText-delete-service-account": "",
+      "confirmText-disable-service-account": "",
       "delete-service-account": "Usuń konto usługi",
       "disable-service-account": "Wyłącz konto usługi",
       "enable-service-account": "Włącz konto usługi",
@@ -11033,6 +11320,7 @@
       "used-by": "Używane przez"
     },
     "service-account-profile-row": {
+      "confirmText-save": "",
       "edit": "Edytuj"
     },
     "service-account-role-row": {
@@ -11046,10 +11334,18 @@
     },
     "service-accounts-list-page-unconnected": {
       "add-service-account": "Dodaj konto usługi",
+      "body-delete-with-tokens": "",
+      "body-disable-service-account": "",
+      "confirmText-delete": "",
+      "confirmText-disable-service-account": "",
       "placeholder-search-service-account-by-name": "Wyszukaj konto usługi według nazwy",
       "sub-title": "Konta usług i ich tokeny mogą być używane do uwierzytelniania w interfejsie API Grafana. Więcej informacji znajdziesz w <2>dokumentacji.</2>",
       "title-delete-service-account": "Usuń konto usługi",
-      "title-disable-service-account": "Wyłącz konto usługi"
+      "title-disable-service-account": "Wyłącz konto usługi",
+      "body-delete_one": "",
+      "body-delete_few": "",
+      "body-delete_many": "",
+      "body-delete_other": ""
     },
     "token-expiration": {
       "content-this-token-has-expired": "Token stracił ważność",
@@ -11441,7 +11737,7 @@
       "label-never": ""
     },
     "status-history-panel": {
-      "too-many-points_one": "Zbyt wiele punktów, aby można było prawidłowo je zwizualizować. <1></1>Zaktualizuj zapytanie, aby zwróciło mniej punktów. <3></3>(Otrzymano {{count}} punkt)",
+      "too-many-points_one": "Zbyt wiele punktów, aby można było prawidłowo je zwizualizować. <1></1>Zaktualizuj zapytanie, aby zwróciło mniej punktów. <3></3>(Otrzymano {{count}} punktu)",
       "too-many-points_few": "Zbyt wiele punktów, aby można było prawidłowo je zwizualizować. <1></1>Zaktualizuj zapytanie, aby zwróciło mniej punktów. <3></3>(Otrzymano {{count}} punkty)",
       "too-many-points_many": "Zbyt wiele punktów, aby można było prawidłowo je zwizualizować. <1></1>Zaktualizuj zapytanie, aby zwróciło mniej punktów. <3></3>(Otrzymano {{count}} punktów)",
       "too-many-points_other": "Zbyt wiele punktów, aby można było prawidłowo je zwizualizować. <1></1>Zaktualizuj zapytanie, aby zwróciło mniej punktów. <3></3>(Otrzymano {{count}} punktu)"
@@ -11588,6 +11884,7 @@
     "tag-option-label": "Opcja tagu"
   },
   "team-picker": {
+    "noOptionsMessage-no-teams-found": "",
     "select-aria-label": "Selektor zespołu",
     "select-placeholder": "Wybierz zespół"
   },
@@ -11913,6 +12210,7 @@
     "convert-field-type-transformer-editor": {
       "aria-label-add-a-convert-field-type-transformer": "Dodaj transformator typu Konwersja pól",
       "aria-label-remove-convert-field-type-transformer": "Usuń transformator typu Konwersja pól",
+      "convert-field-type": "",
       "label": {
         "browser": "Przeglądarka",
         "utc": "UTC"
@@ -11955,6 +12253,11 @@
       "remove-enum-row-tooltip-delete": "Usuń"
     },
     "extract-fields-transformer-editor": {
+      "field-name-picker-settings": {
+        "placeholderText": {
+          "select-field": ""
+        }
+      },
       "label-delimiter": "Znak rozdzielający",
       "label-format": "Format",
       "label-keep-time": "Rejestruj czas",
@@ -11968,6 +12271,14 @@
       "aria-label-threshold-color": "Kolor progu"
     },
     "field-lookup-transformer-editor": {
+      "field-name-picker-settings": {
+        "noFieldsMessage": {
+          "no-text-fields-found": ""
+        },
+        "placeholderText": {
+          "select-text-field": ""
+        }
+      },
       "label-field": "Pole",
       "label-lookup": "Wyszukiwanie"
     },
@@ -11993,10 +12304,30 @@
     },
     "filter-by-value-transformer-editor": {
       "add-condition": "Dodaj warunek",
+      "filter-match": {
+        "label": {
+          "match-all": "",
+          "match-any": ""
+        }
+      },
+      "filter-types": {
+        "label": {
+          "exclude": "",
+          "include": ""
+        }
+      },
       "label-conditions": "Warunki",
       "label-filter-type": "Typ filtra"
     },
     "format-string-transfomer-editor": {
+      "field-name-picker-settings": {
+        "noFieldsMessage": {
+          "no-text-fields-found": ""
+        },
+        "placeholderText": {
+          "select-text-field": ""
+        }
+      },
       "label-field": "Pole",
       "label-format": "Format",
       "label-substring-range": "Zakres ciągu podrzędnego"
@@ -12307,6 +12638,7 @@
     "title": "Organizacje"
   },
   "user-picker": {
+    "noOptionsMessage-no-users-found": "",
     "select-aria-label": "Selektor użytkownika",
     "select-placeholder": "Zacznij pisać, aby wyszukać użytkownika"
   },
@@ -12392,6 +12724,8 @@
       }
     },
     "confirm-delete-modal": {
+      "body-delete-variable": "",
+      "confirmText-delete": "",
       "title-delete-variable": "Usuń zmienną"
     },
     "create-ad-hoc-variable-adapter": {
@@ -12440,9 +12774,24 @@
       "label-refresh": "Odśwież"
     },
     "query-variable-sort-select": {
-      "description-values-variable": "Jak sortować wartości tej zmiennej"
+      "description-values-variable": "Jak sortować wartości tej zmiennej",
+      "name-sort": "",
+      "sort_options": {
+        "label": {
+          "alphabetical-asc": "",
+          "alphabetical-caseinsensitive-asc": "",
+          "alphabetical-caseinsensitive-desc": "",
+          "alphabetical-desc": "",
+          "disabled": "",
+          "natural-asc": "",
+          "natural-desc": "",
+          "numerical-asc": "",
+          "numerical-desc": ""
+        }
+      }
     },
     "text-box-variable-editor": {
+      "name-default-value": "",
       "placeholder-default-value-if-any": "wartość domyślna, jeśli istnieje",
       "text-options": "Opcje tekstu"
     },
@@ -12471,6 +12820,8 @@
       "description-optional-display-name": "Opcjonalna nazwa wyświetlana",
       "description-template-variable-characters": "Nazwa zmiennej szablonu. (maks. 50 znaków)",
       "general": "Ogólne",
+      "name-label": "",
+      "name-name": "",
       "placeholder-descriptive-text": "Tekst opisowy",
       "placeholder-label-name": "Nazwa etykiety",
       "placeholder-variable-name": "Nazwa zmiennej",
@@ -12485,9 +12836,15 @@
       "tooltip-duplicate-variable": "Duplikuj zmienną",
       "tooltip-remove-variable": "Usuń zmienną"
     },
+    "variable-editor-un-connected": {
+      "name-description": ""
+    },
     "variable-options": {
       "aria-label-toggle-all-values": "Przełącz wszystkie wartości"
     },
+    "variable-type-select": {
+      "name-select-variable-type": ""
+    },
     "variable-usages-button": {
       "tooltip-show-usages": "Wyświetl użycie"
     },
diff --git a/public/locales/pt-BR/grafana.json b/public/locales/pt-BR/grafana.json
index 32f6cfcf51f..30874326182 100644
--- a/public/locales/pt-BR/grafana.json
+++ b/public/locales/pt-BR/grafana.json
@@ -84,6 +84,7 @@
     "admin-feature-toggles-table": {
       "confirm-modal-body-1": "Alguns recursos estão estáveis (GA) e habilitados por padrão, enquanto outros estão atualmente em fase Beta preliminar, disponíveis para acesso antecipado.",
       "confirm-modal-body-2": "Aconselhamos que você entenda o que cada mudança de recurso pode causar antes de fazer alterações.",
+      "confirmText-save-changes": "",
       "get-stage-cell": {
         "beta": "Beta",
         "content-general-availability": "Disponibilidade geral",
@@ -96,14 +97,21 @@
     },
     "admin-orgs-table": {
       "aria-label-delete-org": "Excluir org.",
+      "confirmText-delete": "",
       "title-delete": "Excluir"
     },
     "anon-users": {
       "not-found": "Nenhum usuário anônimo encontrado."
     },
     "base-user-sessions": {
+      "body-force-logout-from-all-devices": "",
+      "confirmText-confirm-logout": "",
+      "confirmText-force-logout": "",
       "title-force-logout-from-all-devices": "Forçar desconexão de todos os dispositivos"
     },
+    "change-org-button": {
+      "confirmText-save": ""
+    },
     "edit-org": {
       "access-denied": "Você não tem permissão para ver usuários nesta organização. Para atualizar esta organização, entre em contato com o administrador do servidor.",
       "heading": "Editar Organização",
@@ -208,9 +216,11 @@
       "not-editable": "Não é possível editar a função deste usuário porque ela está sincronizada com seu provedor de autenticação. Consulte os <1>Documentos de autenticação da Grafana</1> para saber mais."
     },
     "org-users-table": {
+      "body-delete": "",
       "columns": {
         "aria-label-role": "Função"
       },
+      "confirmText-delete": "",
       "delete-aria-label": "Excluir usuário: {{name}}",
       "title-delete": "Excluir"
     },
@@ -241,6 +251,9 @@
     "settings": {
       "info-description": "Essas configurações do sistema são definidas em grafana.ini ou custom.ini (ou substituídas em variáveis ENV). Para alterá-las, você precisa reiniciar o Grafana."
     },
+    "un-themed-org-row": {
+      "confirmText-confirm-removal": ""
+    },
     "upgrade-info": {
       "title": "Licença Enterprise"
     },
@@ -293,12 +306,17 @@
     },
     "user-permissions": {
       "change-button": "Alterar",
+      "confirmText-change": "",
       "grafana-admin-key": "Administrador da Grafana",
       "grafana-admin-no": "Não",
       "grafana-admin-yes": "Sim",
       "title": "Permissões"
     },
     "user-profile": {
+      "body-delete": "",
+      "body-disable": "",
+      "confirmText-delete-user": "",
+      "confirmText-disable-user": "",
       "delete-button": "Excluir usuário",
       "disable-button": "Desativar usuário",
       "edit-button": "Editar",
@@ -312,6 +330,9 @@
       "title-delete-user": "Excluir usuário",
       "title-disable-user": "Desativar usuário"
     },
+    "user-profile-row": {
+      "confirmText-save": ""
+    },
     "user-sessions": {
       "browser-column": "Navegador e sistema operacional",
       "force-logout-all-button": "Forçar desconexão de todos os dispositivos",
@@ -461,6 +482,9 @@
       "label-muting-grouping-and-timings-optional": "Silenciamento, agrupamento e cronogramas (opcional)",
       "title-muting-grouping-and-timings": "Silenciamento, agrupamento e cronogramas"
     },
+    "alert-manager-picker": {
+      "noOptionsMessage-no-datasources-found": ""
+    },
     "alert-menu": {
       "copy-link": "Copiar link",
       "duplicate": "Duplicar",
@@ -550,6 +574,7 @@
       "view-configuration": "Ver configuração"
     },
     "alertmanager-config": {
+      "confirmText-yes-reset-configuration": "",
       "gma-manual-configuration-description": "A configuração interna do Grafana Alertmanager não pode ser alterada manualmente. Para alterar essa configuração, edite os recursos individuais por meio da interface do usuário.",
       "gma-manual-configuration-is-not-supported": "Não se permite fazer alterações de configuração manual",
       "message": {
@@ -564,11 +589,13 @@
       "title-resetting-alertmanager-configuration": "Redefinindo a configuração do Alertmanager"
     },
     "alertmanager-configuration-version-manager": {
+      "body-restore-configuration-version-unsaved-changes": "",
       "columns": {
         "compare": "Comparar",
         "restore": "Restaurar",
         "text-latest": "Mais recentes"
       },
+      "confirmText-yes-restore-configuration": "",
       "loading": "Carregando...",
       "no-previous-configurations": "Sem configurações anteriores",
       "this-might-take-a-while": "Isso pode demorar um pouco…",
@@ -848,8 +875,10 @@
     },
     "contact-point-header": {
       "aria-label-more-actions": "Mais ações para o ponto de contato \"{{contactPointName}}\"",
+      "ariaLabel-delete": "",
       "button-edit": "Editar",
       "button-view": "Visualizar",
+      "export-ariaLabel-export": "",
       "export-label-export": "Exportar",
       "label-delete": "Excluir",
       "label-manage-permissions": "Gerenciar permissões",
@@ -1384,6 +1413,7 @@
       "label-disable-resolved-message": "Desativar mensagem resolvida"
     },
     "grafana-evaluation-behavior-step": {
+      "loadingMessage-loading-groups": "",
       "message": {
         "must-be-a-positive-integer": "Deve ser um número inteiro positivo.",
         "must-enter-a-group-name": "É necessário inserir um nome de grupo"
@@ -1842,7 +1872,11 @@
             "other-data-sources": "Outras fontes de dados"
           }
         }
-      }
+      },
+      "noOptionsMessage-no-datasources-found": ""
+    },
+    "mute-timing-actions-button": {
+      "body-delete-mute-timing": ""
     },
     "mute-timing-actions-buttons": {
       "text-disabled": "Desativado",
@@ -2093,9 +2127,11 @@
       "update-errors": {
         "conflict": "A árvore de políticas de notificação foi atualizada por outro usuário.",
         "error-code": "Mensagem de erro: \"{{error}}\"",
-        "fallback": "Ocorreu um erro ao atualizar suas políticas de notificação.",
+        "routes": {
+          "conflictingMatchers": ""
+        },
         "suffix": "Atualize a página e tente novamente.",
-        "title": "Erro ao salvar a política de notificação"
+        "title": ""
       },
       "n-more-policies_one": "{{count}} política adicional",
       "n-more-policies_other": "{{count}} políticas adicionais"
@@ -2151,6 +2187,7 @@
     "query-and-expressions-step": {
       "add-query": "Adicionar consulta",
       "body-queries-expressions-configured": "Crie pelo menos uma consulta ou expressão para receber alertas",
+      "confirmText-deactivate": "",
       "expressions": "Expressões",
       "loading-data-sources": "Carregando fontes de dados…",
       "manipulate-returned-queries-other-operations": "Manipule os dados que retornaram das consultas usando operações matemáticas e outras operações.",
@@ -2218,6 +2255,7 @@
     "redirect-to-clone-rule": {
       "body-evaluation-group": "Você precisará definir um novo grupo de avaliação para a regra copiada, pois o original foi provisionado e não pode ser usado para regras criadas na interface do usuário.",
       "body-not-provisioned": "A nova regra <1>não</1> será marcada como uma regra provisionada.",
+      "confirmText-copy": "",
       "title-copy-provisioned-alert-rule": "Copiar regra de alerta provisionada"
     },
     "redirect-to-rule-viewer": {
@@ -2415,8 +2453,6 @@
       "title-inspect-alert-rule": "Inspecionar regra de alerta"
     },
     "rule-list": {
-      "cannot-find-rule-details-for": "Não é possível encontrar detalhes da regra para o UID {{uid}}",
-      "cannot-load-rule-details-for": "Não é possível carregar detalhes da regra para o UID {{uid}}",
       "configure-datasource": "Configuração",
       "draft-new-rule": "Crie o rascunho de uma nova regra",
       "ds-error": {
@@ -2766,6 +2802,9 @@
       "existing-templates-selector-placeholder-choose-notification-template": "Escolha o modelo de notificação",
       "loading": "Carregando...",
       "template-options": {
+        "ariaLabel": {
+          "select-notification-template": ""
+        },
         "label": {
           "select-notification-template": "Selecionar modelo de notificação"
         }
@@ -2792,6 +2831,8 @@
     },
     "templates-table": {
       "actions": "Ações",
+      "body-delete-template-group": "",
+      "confirmText-yes-delete": "",
       "no-templates-defined": "Nenhum modelo definido.",
       "template-group": "Grupo de modelos",
       "title-delete-template-group": "Excluir grupo de modelos"
@@ -2919,6 +2960,11 @@
         "title-delete-contact-point": "Excluir ponto de contato"
       }
     },
+    "use-delete-modal": {
+      "modal": {
+        "confirmText-yes-delete": ""
+      }
+    },
     "use-delete-policy-modal": {
       "modal-element": {
         "title-delete-notification-policy": "Excluir política de notificação"
@@ -3075,7 +3121,8 @@
     "annotation-field-mapper": {
       "annotation": "Anotação",
       "first-value": "Primeiro valor",
-      "from": ""
+      "from": "",
+      "noOptionsMessage-unknown-field-names": ""
     },
     "empty-state": {
       "button-title": "Adicionar consulta de anotação",
@@ -3209,7 +3256,7 @@
       "team-ids-github": "Lista de números inteiros de IDs de equipe.",
       "team-ids-label": "IDs de equipe",
       "team-ids-numbers": "Os IDs de equipe devem ser números.",
-      "team-ids-other": "Lista de strings de IDs de equipe.",
+      "team-ids-other": "",
       "team-ids-placeholder": "Insira os IDs de equipe e pressione Enter para adicioná-los",
       "teams-url-description": "A URL usada para consultar IDs de equipe. Se não for definido, o valor padrão é /teams.",
       "teams-url-description-oauth": "Se você configurar \"{{ teamsURLLabel }}\", também será necessário configurar \"{{ teamIDsAttributePathLabel }}\".",
@@ -3253,6 +3300,7 @@
       "additional-actions-menu": {
         "label-reset-to-default-values": "Redefinir para os valores padrão"
       },
+      "confirmText-reset": "",
       "disable": "Desativar",
       "disabling": "Desabilitando...",
       "discard": "Descartar",
@@ -4180,8 +4228,8 @@
     }
   },
   "dashbaord-scene": {
-    "interval-variable-form": {
-      "description-auto-option": "Calcula dinamicamente o intervalo dividindo o intervalo de tempo pela contagem especificada"
+    "variable-editor-form": {
+      "run-query": ""
     }
   },
   "dashboard": {
@@ -4343,6 +4391,9 @@
     },
     "dash-nav": {
       "on-open-snapshot-original": {
+        "confirmText": {
+          "proceed": ""
+        },
         "title": {
           "proceed-to-external-site": "Deseja prosseguir para o site externo?"
         }
@@ -4557,6 +4608,13 @@
           "editable": "Editável",
           "readonly": "Somente leitura"
         }
+      },
+      "graph_tooltip_options": {
+        "label": {
+          "default": "",
+          "shared-crosshair": "",
+          "shared-tooltip": ""
+        }
       }
     },
     "get-debug-dashboard": {
@@ -4861,6 +4919,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "Tem certeza de que deseja restaurar o painel para a versão {{version}}? Todas as alterações não salvas serão perdidas.",
+      "confirmText-restore-version": "",
       "title-restore-version": "Restaurar versão"
     },
     "row-options-button": {
@@ -4911,6 +4970,9 @@
         "title-not-unique": "Este título não é exclusivo"
       }
     },
+    "save-dashboard": {
+      "message-dashboard-saved": ""
+    },
     "save-dashboard-as-button": {
       "save-as": "Salvar como"
     },
@@ -4945,6 +5007,7 @@
     "save-dashboard-error-proxy": {
       "body-name-exists": "Já existe um painel com o mesmo nome na pasta selecionada.<1></1><2>Deseja salvar este painel mesmo assim?</2>",
       "body-version-mismatch": "Outra pessoa atualizou este painel<1></1><2>Deseja salvar este painel mesmo assim?</2>",
+      "confirmText-save-and-overwrite": "",
       "title-name-exists": "Conflito",
       "title-version-mismatch": "Conflito"
     },
@@ -5141,7 +5204,9 @@
       "label-apply-transformation-to": "Aplicar transformação a"
     },
     "transformation-operation-row": {
+      "body-delete": "",
       "render-actions": {
+        "confirmText-delete": "",
         "title-debug": "Depurar",
         "title-disable-transformation": "Desativar transformação",
         "title-filter": "Filtro",
@@ -5163,10 +5228,14 @@
       "show-images": "Exibir imagens",
       "title-add-another-transformation": "Adicionar outra transformação"
     },
+    "un-theme-transformations-editor": {
+      "body-delete-all-transformations": ""
+    },
     "un-themed-transformations-editor": {
       "actions": {
         "add-another-transformation": "Adicionar outra transformação"
       },
+      "confirmText-delete-all": "",
       "delete-all-transformations": "Excluir todas as transformações",
       "title-delete-all-transformations": "Deseja excluir todas as transformações?",
       "tooltip-clear-search": "Limpar pesquisa",
@@ -5203,6 +5272,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "Alternar seleção da versão {{version}}",
       "date": "Data",
+      "name-latest": "",
       "notes": "Observações",
       "restore": "Restaurar",
       "updated-by": "Atualizado por",
@@ -5279,7 +5349,8 @@
       "description-enables-users-custom-values": "Permite que os usuários adicionem valores personalizados à lista",
       "description-provide-dimensions-as-csv-dimension-name-dimension-id": "Forneça dimensões como CSV: {{name}}, {{value}}",
       "label-data-source": "Fonte de dados",
-      "label-use-static-key-dimensions": "Usar dimensões de chave estática"
+      "label-use-static-key-dimensions": "Usar dimensões de chave estática",
+      "name-allow-custom-values": ""
     },
     "add-to-dashboard": {
       "message": {
@@ -5352,6 +5423,9 @@
       }
     },
     "config-public-dashboard": {
+      "confirmText": {
+        "revoke-public-url": ""
+      },
       "title": {
         "revoke-public-url": "Revogar URL público"
       }
@@ -5363,6 +5437,7 @@
     },
     "custom-variable-form": {
       "custom-options": "Opções personalizadas",
+      "name-values-separated-comma": "",
       "selection-options": "Opções de seleção"
     },
     "dashboard-edit-pane-renderer": {
@@ -5381,6 +5456,12 @@
       "label-type": "Tipo",
       "label-url": "URL",
       "label-with-tags": "Com tags",
+      "link-type-options": {
+        "label": {
+          "dashboards": "",
+          "link": ""
+        }
+      },
       "placeholder-open-dashboard": "Abrir o painel"
     },
     "dashboard-link-list": {
@@ -5427,6 +5508,8 @@
       "data-source-options": "Opções de fonte de dados",
       "description-instance-name-filter": "Filtro Regex para as instâncias de fonte de dados a serem escolhidas na lista de valores de variáveis. Deixe em branco para todos.",
       "example-instance-name-filter": "Exemplo: <codeExample />",
+      "name-instance-name-filter": "",
+      "name-type": "",
       "selection-options": "Opções de seleção"
     },
     "default-grid-layout-manager": {
@@ -5472,6 +5555,21 @@
     "empty-transformations-message": {
       "add-transformation": "Adicionar transformação"
     },
+    "general-settings-edit-view": {
+      "editable_options": {
+        "label": {
+          "editable": "",
+          "readonly": ""
+        }
+      },
+      "graph_tooltip_options": {
+        "label": {
+          "default": "",
+          "shared-crosshair": "",
+          "shared-tooltip": ""
+        }
+      }
+    },
     "get-edit-options": {
       "title": {
         "column-options": "Opções de coluna",
@@ -5502,7 +5600,8 @@
       "description-provide-dimensions-as-csv-dimension-name-dimension-id": "Forneça dimensões como CSV: {{name}}, {{value}}",
       "group-by-options": "Agrupar por opções",
       "label-data-source": "Fonte de dados",
-      "label-use-static-group-by-dimensions": "Usar dimensões de grupo estático"
+      "label-use-static-group-by-dimensions": "Usar dimensões de grupo estático",
+      "name-allow-custom-values": ""
     },
     "help-wizard": {
       "copy-to-clipboard": "Copiar para a área de transferência",
@@ -5538,9 +5637,14 @@
       "apply": "Aplicar"
     },
     "interval-variable-form": {
+      "description-auto-option": "",
       "description-calculated-value-below-threshold": "O valor calculado não ficará abaixo desse limite",
       "description-step-count": "Quantas vezes o intervalo de tempo atual deve ser dividido para calcular o valor",
-      "interval-options": "Opções de intervalo"
+      "interval-options": "Opções de intervalo",
+      "name-auto-option": "",
+      "name-min-interval": "",
+      "name-step-count": "",
+      "name-values": ""
     },
     "json-model-edit-view": {
       "cancel-button": {
@@ -5565,6 +5669,9 @@
       "title-name-already-exists": "O nome já existe"
     },
     "on-open-snapshot-original-dashboard": {
+      "confirmText": {
+        "proceed": ""
+      },
       "title": {
         "proceed-to-external-site": "Deseja prosseguir para o site externo?"
       }
@@ -5600,6 +5707,8 @@
     },
     "panel-data-transformations-tab-rendered": {
       "add-another-transformation": "Adicionar outra transformação",
+      "body-delete-all-transformations": "",
+      "confirmText-delete-all": "",
       "delete-all-transformations": "Excluir todas as transformações",
       "title-delete-all-transformations": "Deseja excluir todas as transformações?"
     },
@@ -5653,6 +5762,7 @@
       "description-optional": "Opcional, se você quiser extrair parte de um nome de série ou segmento de node de métrica.",
       "label-data-source": "Fonte de dados",
       "label-target-data-source": "Fonte de dados de destino",
+      "name-regex": "",
       "query-options": "Opções de consulta",
       "selection-options": "Opções de seleção"
     },
@@ -5667,6 +5777,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "Tem certeza de que deseja restaurar o painel para a versão {{version}}? Todas as alterações não salvas serão perdidas.",
+      "confirmText-restore-version": "",
       "title-restore-version": "Restaurar versão"
     },
     "save-button": {
@@ -5760,7 +5871,11 @@
     "selection-options-form": {
       "description-enables-multiple-values-selected": "Permite que vários valores sejam selecionados ao mesmo tempo",
       "description-enables-option-include-variables": "Ativa uma opção para incluir todos os valores",
-      "description-enables-users-custom-values": "Permite que os usuários adicionem valores personalizados à lista"
+      "description-enables-users-custom-values": "Permite que os usuários adicionem valores personalizados à lista",
+      "name-allow-custom-values": "",
+      "name-custom-all-value": "",
+      "name-include-all-option": "",
+      "name-multi-value": ""
     },
     "share-button": {
       "aria-label-sharedropdownmenu": "Alternar menu de compartilhamento"
@@ -5780,6 +5895,9 @@
         "copy-to-clipboard-failed": "Falha ao copiar para a área de transferência"
       }
     },
+    "text-box-variable": {
+      "name-default-value": ""
+    },
     "text-box-variable-form": {
       "placeholder-default-value-if-any": "(opcional)",
       "text-options": "Opções de texto"
@@ -5803,6 +5921,8 @@
       }
     },
     "unlink-modal": {
+      "body-unlink-panel": "",
+      "confirmText-yes-unlink": "",
       "title-really-unlink-panel": "Tem certeza de que deseja desvincular este painel?"
     },
     "unsaved-changes-modal": {
@@ -5819,6 +5939,9 @@
         }
       }
     },
+    "use-save-dashboard": {
+      "message-dashboard-saved": ""
+    },
     "variable-check-indicator": {
       "aria-label-variable-referenced-dashboard": "Esta variável não é referenciada por nenhuma variável ou painel.",
       "aria-label-variable-referenced-other-variables-dashboard": "Esta variável é referenciada por outras variáveis ou painel.",
@@ -5828,10 +5951,16 @@
     "variable-editor-form": {
       "aria-label-variable-editor-form": "Formulário do editor de variáveis",
       "back-to-list": "Voltar para a lista",
+      "confirmText": {
+        "delete-variable": ""
+      },
       "delete": "Excluir",
       "description-optional-display-name": "Nome de exibição opcional",
       "description-template-variable-characters": "O nome da variável do modelo. (Até 50 caracteres)",
       "general": "Geral",
+      "name-description": "",
+      "name-label": "",
+      "name-name": "",
       "placeholder-descriptive-text": "Texto descritivo",
       "placeholder-label-name": "Nome do rótulo",
       "placeholder-variable-name": "Nome da variável",
@@ -5846,13 +5975,25 @@
       "variable": "Variável"
     },
     "variable-editor-list-row": {
+      "body-delete-variable": "",
+      "confirmText-delete-variable": "",
       "title-delete-variable": "Excluir variável",
       "tooltip-duplicate-variable": "Duplicar variável",
       "tooltip-remove-variable": "Remover variável"
     },
     "variable-hide-select": {
+      "hide_options": {
+        "label": {
+          "label": "",
+          "nothing": "",
+          "variable": ""
+        }
+      },
       "label": "Ocultar"
     },
+    "variable-type-select": {
+      "name-variable-type": ""
+    },
     "variable-usages-button": {
       "title-show-usages": "Mostrando usos para: {{variableId}}",
       "tooltip-show-usages": "Exibir usos"
@@ -5879,6 +6020,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "Alternar seleção da versão {{version}}",
       "date": "Data",
+      "name-latest": "",
       "notes": "Observações",
       "restore": "Restaurar",
       "updated-by": "Atualizado por",
@@ -6266,7 +6408,8 @@
       }
     },
     "color-dimension-editor": {
-      "label-fixed-color": ""
+      "label-fixed-color": "",
+      "noOptionsMessage-no-fields-found": ""
     },
     "file-dropzone-custom-children": {
       "upload": "Carregar"
@@ -6304,6 +6447,7 @@
       },
       "label-limit": "Limite",
       "label-value": "Valor",
+      "noOptionsMessage-no-fields-found": "",
       "scalar-options": {
         "description-clamped": "",
         "description-mod": "",
@@ -6312,9 +6456,15 @@
       }
     },
     "scale-dimension-editor": {
+      "fixed-value-option": {
+        "label": {
+          "fixed-value": ""
+        }
+      },
       "label-max": "Máx.",
       "label-min": "Mín.",
-      "label-value": "Valor"
+      "label-value": "Valor",
+      "noOptionsMessage-no-fields-found": ""
     },
     "text-dimension-editor": {
       "description-field": "",
@@ -6886,6 +7036,8 @@
       "aria-label-select-service-name-operator": "Selecionar operador de nome do serviço",
       "aria-label-select-span-name": "Selecionar nome do intervalo",
       "aria-label-select-span-name-operator": "Selecione o operador de nome de intervalo",
+      "ariaLabel-select-max-span-duration": "",
+      "ariaLabel-select-min-span-duration": "",
       "label-collapse": "Filtros de intervalo",
       "label-duration": "Duração",
       "label-service-name": "Nome do serviço",
@@ -6956,6 +7108,8 @@
       "split-widen": "Painel amplo"
     },
     "trace-page-actions": {
+      "ariaLabel-copy-trace-id": "",
+      "ariaLabel-export-trace": "",
       "give-feedback": "Dar feedback",
       "label-copied": "Copiado!",
       "label-export": "Exportar",
@@ -7093,6 +7247,7 @@
   },
   "folder-filter": {
     "clear-folder-button": "Limpar pastas",
+    "noOptionsMessage-no-folders-found": "",
     "select-aria-label": "Filtro de pasta",
     "select-placeholder": "Filtrar por pasta"
   },
@@ -7161,7 +7316,53 @@
     "incomplete-request-error": "Não foi possível concluir sua solicitação. Tente novamente.",
     "send-custom-feedback": "Enviar"
   },
+  "geo": {
+    "get-geometry-field": {
+      "warning-gazetteer-not-found": "",
+      "warning-no-geometry": "",
+      "warning-select-geohash": "",
+      "warning-select-lat-long": "",
+      "warning-select-lookup": "",
+      "warning-unable-to-find": ""
+    },
+    "location-editor": {
+      "geohash-field": {
+        "no-fields-message": ""
+      },
+      "latitude-field": {
+        "no-fields-message": ""
+      },
+      "longitude-field": {
+        "no-fields-message": ""
+      },
+      "lookup-field": {
+        "no-fields-message": ""
+      },
+      "name-gazetteer": "",
+      "name-geohash-field": "",
+      "name-latitude-field": "",
+      "name-location-mode": "",
+      "name-longitude-field": "",
+      "name-lookup-field": ""
+    },
+    "location-more-editor": {
+      "mode-options": {
+        "description-auto": "",
+        "description-coords": "",
+        "description-geohash": "",
+        "description-lookup": "",
+        "label-auto": "",
+        "label-coords": "",
+        "label-geohash": "",
+        "label-lookup": ""
+      }
+    }
+  },
   "geomap": {
+    "category-basemap-layer": "",
+    "category-map-controls": "",
+    "category-map-layers": "",
+    "category-map-view": "",
     "coordinates-map-view-editor": {
       "label-latitude": "Latitude",
       "label-longitude": "Longitude"
@@ -7170,6 +7371,14 @@
       "center": "Centro:",
       "zoom": "Zoom:"
     },
+    "description-initial-view": "",
+    "description-mouse-wheel-zoom": "",
+    "description-share-view": "",
+    "description-show-attribution": "",
+    "description-show-debug": "",
+    "description-show-measure": "",
+    "description-show-scale": "",
+    "description-show-zoom": "",
     "fit-map-view-editor": {
       "all-layers-editor-fragment": {
         "label-layer": "Camada"
@@ -7192,6 +7401,14 @@
     "geomap-style-rules-editor": {
       "aria-label-add-geomap-style-rule": "Adicionar regra de estilo de mapa geográfico"
     },
+    "layer-editor": {
+      "category-base-layer": "",
+      "description-display-tooltip": "",
+      "name-data": "",
+      "name-display-tooltip": "",
+      "name-layer-type": "",
+      "name-opacity": ""
+    },
     "layers-editor": {
       "label-add-layer": "Adicionar camada",
       "no-layers": "Não há camadas?"
@@ -7202,16 +7419,38 @@
       "label-zoom": "Zoom",
       "use-current-map-settings": "Usar as configurações atuais do mapa"
     },
+    "markers-layer": {
+      "description-show-legend": "",
+      "name-show-legend": "",
+      "name-styles": ""
+    },
     "markers-legend": {
       "title-symbol": "Símbolo"
     },
     "measure-overlay": {
       "tooltip-show-measure-tools": "Exibir ferramentas de medição"
     },
+    "name-initial-view": "",
+    "name-mouse-wheel-zoom": "",
+    "name-share-view": "",
+    "name-show-attribution": "",
+    "name-show-debug": "",
+    "name-show-measure": "",
+    "name-show-scale": "",
+    "name-show-zoom": "",
+    "name-tooltip": "",
+    "photos-layer": {
+      "noFieldsMessage-no-string-fields": ""
+    },
     "plugin": {
       "basemap-layer-configured-server-admin": "A camada do mapa base é configurada pelo administrador do servidor."
     },
     "style-editor": {
+      "horizontal-align-options": {
+        "label-center": "",
+        "label-left": "",
+        "label-right": ""
+      },
       "label-align": "Alinhar",
       "label-baseline": "Referência",
       "label-color": "Cor",
@@ -7225,7 +7464,14 @@
       "label-symbol-vertical-align": "Alinhamento vertical do símbolo",
       "label-text-label": "Rótulo do texto",
       "label-x-offset": "Desvio em X",
-      "label-y-offset": "Desvio em Y"
+      "label-y-offset": "Desvio em Y",
+      "placeholderText-select-symbol": "",
+      "placeholderText-select-symbol-or-add-text": "",
+      "vertical-align-options": {
+        "label-bottom": "",
+        "label-center": "",
+        "label-top": ""
+      }
     },
     "style-rule-editor": {
       "aria-label-comparison-operator": "Operador de comparação",
@@ -7236,6 +7482,15 @@
       "placeholder-feature-property": "Propriedade do recurso",
       "placeholder-numeric-value": "Valor numérico",
       "placeholder-value": "valor"
+    },
+    "tooltip-options": {
+      "description-details": "",
+      "description-none": "",
+      "label-details": "",
+      "label-none": ""
+    },
+    "utils": {
+      "get-next-layer-name": ""
     }
   },
   "get-enterprise": {
@@ -7485,7 +7740,8 @@
       "aria-label-selected-color": "cor {{colorLabel}}"
     },
     "confirm-button": {
-      "cancel": "Cancelar"
+      "cancel": "Cancelar",
+      "confirmText-delete": ""
     },
     "confirm-content": {
       "placeholder": "Digite \"{{confirmPromptText}}\" para confirmar"
@@ -7667,6 +7923,8 @@
     },
     "panel-chrome": {
       "aria-label-toggle-collapse": "alternar recolher painel",
+      "ariaLabel-panel-loading": "",
+      "ariaLabel-panel-status": "",
       "tooltip-cancel": "Cancelar consulta",
       "tooltip-cancel-loading": "Cancelar consulta",
       "tooltip-stop-streaming": "Parar streaming",
@@ -7834,6 +8092,12 @@
       "footer-click-to-action": "Clique para {{actionTitle}}",
       "footer-click-to-navigate": "Clique para abrir {{linkTitle}}",
       "timestamp": "Registro de data/hora"
+    },
+    "week-start-picker": {
+      "weekStarts-label-default": "",
+      "weekStarts-label-monday": "",
+      "weekStarts-label-saturday": "",
+      "weekStarts-label-sunday": ""
     }
   },
   "graph": {
@@ -8212,6 +8476,10 @@
     "add-library-panel-modal": {
       "title-create-library-panel": "Criar painel de biblioteca"
     },
+    "change-library-panel-modal": {
+      "confirmText-change": "",
+      "confirmText-replace": ""
+    },
     "confirm": {
       "delete-panel": "Deseja excluir este painel?"
     },
@@ -8656,6 +8924,8 @@
       "updated-on": "Atualizado em"
     },
     "snapshot-list-table": {
+      "body-delete": "",
+      "confirmText-delete": "",
       "title-delete": "Excluir"
     },
     "unthemed-dashboard-import": {
@@ -8667,6 +8937,9 @@
       }
     }
   },
+  "metric-select": {
+    "noOptionsMessage-no-options-found": ""
+  },
   "migrate-to-cloud": {
     "build-snapshot": {
       "description": "Esta ferramenta pode migrar alguns recursos desta instalação para a sua pilha da nuvem. Para começar, você precisará criar uma captura desta instalação. A criação de uma captura normalmente leva menos de dois minutos. A captura é armazenada juntamente com esta instalação da Grafana.",
@@ -9365,7 +9638,7 @@
     "marker": {
       "100-node-count": "> 100 nós",
       "aria-label-hidden-marker": "Marcador de nós ocultos: {{marker}}",
-      "node-count_one": "{{count}} nó",
+      "node-count_one": "{{count}} nós",
       "node-count_other": "{{count}} nós"
     },
     "node": {
@@ -9376,9 +9649,9 @@
       "aria-label-nodes-hidden-warning": "Aviso de nós ocultos",
       "computing-layout": "Layout de computação",
       "no-data": "Sem dados",
-      "hidden-nodes_one": "<0></0> {{count}} nó está oculto devido ao desempenho.",
+      "hidden-nodes_one": "<0></0> {{count}} nós estão ocultos devido ao desempenho.",
       "hidden-nodes_other": "<0></0> {{count}} nós estão ocultos devido ao desempenho.",
-      "processed-nodes_one": "<0></0> O layout em camadas pode ser lento com {{count}} nó.",
+      "processed-nodes_one": "<0></0> O layout em camadas pode ser lento com {{count}} nós.",
       "processed-nodes_other": "<0></0> O layout em camadas pode ser lento com {{count}} nós."
     },
     "node-graph-panel": {
@@ -9505,6 +9778,7 @@
     }
   },
   "org-picker": {
+    "noOptionsMessage-no-organizations-found": "",
     "select-placeholder": "Selecionar organização"
   },
   "page": {
@@ -9727,6 +10001,7 @@
         "permission": "Você não tem permissão para visualizar esta página.",
         "title-access-denied": "Acesso negado"
       },
+      "error-loading-plugin": "",
       "no-root-app-page-component-found": "Nenhum componente de página do aplicativo de origem foi encontrado"
     },
     "browse": {
@@ -9770,8 +10045,7 @@
         "update-status-text": "plug-ins atualizados"
       },
       "versions": {
-        "confirmation-text-1": "Tem certeza de que deseja fazer o downgrade da versão",
-        "confirmation-text-2": "Não é esperado que você faça isso",
+        "confirmation-text": "",
         "downgrade-confirm": "Fazer downgrade",
         "downgrade-title": "Fazer downgrade da versão do plug-in"
       }
@@ -9825,6 +10099,10 @@
     "empty-state": {
       "message": "Nenhum plug-in encontrado"
     },
+    "extensions": {
+      "extension-error-alert-description": "",
+      "extension-error-alert-title": ""
+    },
     "extensions-log-data-source": {
       "message": {
         "ok": "OK"
@@ -9858,7 +10136,11 @@
       "updating": "Atualizando"
     },
     "install-controls-button": {
-      "title-uninstall-modal": "Desinstalar {{plugin}}"
+      "title-uninstall-modal": "Desinstalar {{plugin}}",
+      "uninstall-controls": {
+        "body-uninstall-plugin": "",
+        "confirmText-confirm": ""
+      }
     },
     "install-controls-warning": {
       "body-not-published": "Este plug-in não está publicado em <2>grafana.com/plugins</2> e não pode ser gerenciado por meio do catálogo.",
@@ -10894,6 +11176,7 @@
     }
   },
   "service-account-picker": {
+    "noOptionsMessage-no-service-accounts-found": "",
     "select-aria-label": "Seletor de conta de serviço",
     "select-placeholder": "Comece a digitar para pesquisar contas de serviço"
   },
@@ -10939,6 +11222,10 @@
     },
     "service-account-page-unconnected": {
       "add-service-account-token": "Adicionar token da conta de serviço",
+      "body-delete-service-account": "",
+      "body-disable-service-account": "",
+      "confirmText-delete-service-account": "",
+      "confirmText-disable-service-account": "",
       "delete-service-account": "Excluir conta de serviço",
       "disable-service-account": "Desativar conta de serviço",
       "enable-service-account": "Ativar conta de serviço",
@@ -10965,6 +11252,7 @@
       "used-by": "Usado por"
     },
     "service-account-profile-row": {
+      "confirmText-save": "",
       "edit": "Editar"
     },
     "service-account-role-row": {
@@ -10978,10 +11266,16 @@
     },
     "service-accounts-list-page-unconnected": {
       "add-service-account": "Adicionar conta de serviço",
+      "body-delete-with-tokens": "",
+      "body-disable-service-account": "",
+      "confirmText-delete": "",
+      "confirmText-disable-service-account": "",
       "placeholder-search-service-account-by-name": "Pesquisar conta de serviço por nome",
       "sub-title": "As contas de serviço e seus tokens podem ser usados para autenticação na API da Grafana. Saiba mais na nossa <2>documentação.</2>",
       "title-delete-service-account": "Excluir conta de serviço",
-      "title-disable-service-account": "Desativar conta de serviço"
+      "title-disable-service-account": "Desativar conta de serviço",
+      "body-delete_one": "",
+      "body-delete_other": ""
     },
     "token-expiration": {
       "content-this-token-has-expired": "Este token expirou",
@@ -11373,7 +11667,7 @@
       "label-never": ""
     },
     "status-history-panel": {
-      "too-many-points_one": "Há um número excessivo de pontos para que haja uma visualização adequada. <1></1>Atualize a consulta para retornar menos pontos. <3></3>({{count}} ponto recebido)",
+      "too-many-points_one": "Há um número excessivo de pontos para que haja uma visualização adequada. <1></1>Atualize a consulta para retornar menos pontos. <3></3>({{count}} pontos recebidos)",
       "too-many-points_other": "Há um número excessivo de pontos para que haja uma visualização adequada. <1></1>Atualize a consulta para retornar menos pontos. <3></3>({{count}} pontos recebidos)"
     }
   },
@@ -11518,6 +11812,7 @@
     "tag-option-label": "Opção de tag"
   },
   "team-picker": {
+    "noOptionsMessage-no-teams-found": "",
     "select-aria-label": "Seletor de equipe",
     "select-placeholder": "Selecione uma equipe"
   },
@@ -11843,6 +12138,7 @@
     "convert-field-type-transformer-editor": {
       "aria-label-add-a-convert-field-type-transformer": "Adicionar um transformador de tipo de campo de conversor",
       "aria-label-remove-convert-field-type-transformer": "Remover transformador de tipo de campo de conversor",
+      "convert-field-type": "",
       "label": {
         "browser": "Navegador",
         "utc": "UTC"
@@ -11885,6 +12181,11 @@
       "remove-enum-row-tooltip-delete": "Excluir"
     },
     "extract-fields-transformer-editor": {
+      "field-name-picker-settings": {
+        "placeholderText": {
+          "select-field": ""
+        }
+      },
       "label-delimiter": "Delimitador",
       "label-format": "Formato",
       "label-keep-time": "Manter horário",
@@ -11898,6 +12199,14 @@
       "aria-label-threshold-color": "Cor do limite"
     },
     "field-lookup-transformer-editor": {
+      "field-name-picker-settings": {
+        "noFieldsMessage": {
+          "no-text-fields-found": ""
+        },
+        "placeholderText": {
+          "select-text-field": ""
+        }
+      },
       "label-field": "Campo",
       "label-lookup": "Consulta"
     },
@@ -11923,10 +12232,30 @@
     },
     "filter-by-value-transformer-editor": {
       "add-condition": "Adicionar condição",
+      "filter-match": {
+        "label": {
+          "match-all": "",
+          "match-any": ""
+        }
+      },
+      "filter-types": {
+        "label": {
+          "exclude": "",
+          "include": ""
+        }
+      },
       "label-conditions": "Condições",
       "label-filter-type": "Tipo de filtro"
     },
     "format-string-transfomer-editor": {
+      "field-name-picker-settings": {
+        "noFieldsMessage": {
+          "no-text-fields-found": ""
+        },
+        "placeholderText": {
+          "select-text-field": ""
+        }
+      },
       "label-field": "Campo",
       "label-format": "Formato",
       "label-substring-range": "Intervalo de substring"
@@ -12237,6 +12566,7 @@
     "title": "Organizações"
   },
   "user-picker": {
+    "noOptionsMessage-no-users-found": "",
     "select-aria-label": "Seletor de usuário",
     "select-placeholder": "Comece a digitar para pesquisar um usuário"
   },
@@ -12322,6 +12652,8 @@
       }
     },
     "confirm-delete-modal": {
+      "body-delete-variable": "",
+      "confirmText-delete": "",
       "title-delete-variable": "Excluir variável"
     },
     "create-ad-hoc-variable-adapter": {
@@ -12370,9 +12702,24 @@
       "label-refresh": "Atualizar"
     },
     "query-variable-sort-select": {
-      "description-values-variable": "Como classificar os valores desta variável"
+      "description-values-variable": "Como classificar os valores desta variável",
+      "name-sort": "",
+      "sort_options": {
+        "label": {
+          "alphabetical-asc": "",
+          "alphabetical-caseinsensitive-asc": "",
+          "alphabetical-caseinsensitive-desc": "",
+          "alphabetical-desc": "",
+          "disabled": "",
+          "natural-asc": "",
+          "natural-desc": "",
+          "numerical-asc": "",
+          "numerical-desc": ""
+        }
+      }
     },
     "text-box-variable-editor": {
+      "name-default-value": "",
       "placeholder-default-value-if-any": "valor padrão, se houver",
       "text-options": "Opções de texto"
     },
@@ -12401,6 +12748,8 @@
       "description-optional-display-name": "Nome de exibição opcional",
       "description-template-variable-characters": "O nome da variável do modelo. (Até 50 caracteres)",
       "general": "Geral",
+      "name-label": "",
+      "name-name": "",
       "placeholder-descriptive-text": "Texto descritivo",
       "placeholder-label-name": "Nome do rótulo",
       "placeholder-variable-name": "Nome da variável",
@@ -12415,9 +12764,15 @@
       "tooltip-duplicate-variable": "Duplicar variável",
       "tooltip-remove-variable": "Remover variável"
     },
+    "variable-editor-un-connected": {
+      "name-description": ""
+    },
     "variable-options": {
       "aria-label-toggle-all-values": "Alternar todos os valores"
     },
+    "variable-type-select": {
+      "name-select-variable-type": ""
+    },
     "variable-usages-button": {
       "tooltip-show-usages": "Exibir usos"
     },
diff --git a/public/locales/pt-PT/grafana.json b/public/locales/pt-PT/grafana.json
index f40f99dd17f..24b4f9ad50f 100644
--- a/public/locales/pt-PT/grafana.json
+++ b/public/locales/pt-PT/grafana.json
@@ -84,6 +84,7 @@
     "admin-feature-toggles-table": {
       "confirm-modal-body-1": "Algumas funcionalidades são estáveis (GA) e ativadas por predefinição, enquanto outras estão atualmente na sua fase Beta preliminar, disponíveis para utilizar antecipadamente.",
       "confirm-modal-body-2": "Aconselhamos a compreensão das implicações de cada alteração de funcionalidade antes de efetuar modificações.",
+      "confirmText-save-changes": "",
       "get-stage-cell": {
         "beta": "Beta",
         "content-general-availability": "Disponibilidade geral",
@@ -96,14 +97,21 @@
     },
     "admin-orgs-table": {
       "aria-label-delete-org": "Eliminar organização",
+      "confirmText-delete": "",
       "title-delete": "Eliminar"
     },
     "anon-users": {
       "not-found": "Nenhum utilizador anónimo encontrado."
     },
     "base-user-sessions": {
+      "body-force-logout-from-all-devices": "",
+      "confirmText-confirm-logout": "",
+      "confirmText-force-logout": "",
       "title-force-logout-from-all-devices": "Forçar o encerramento de sessão em todos os dispositivos"
     },
+    "change-org-button": {
+      "confirmText-save": ""
+    },
     "edit-org": {
       "access-denied": "Não tem permissão para ver utilizadores desta organização. Para atualizar esta organização, contacte o administrador do servidor.",
       "heading": "Editar organização",
@@ -208,9 +216,11 @@
       "not-editable": "A função deste utilizador não é editável porque é sincronizada a partir do seu fornecedor de autenticação. Consulte os <1>documentos de autenticação da Grafana</1> para obter detalhes."
     },
     "org-users-table": {
+      "body-delete": "",
       "columns": {
         "aria-label-role": "Função"
       },
+      "confirmText-delete": "",
       "delete-aria-label": "Eliminar utilizador: {{name}}",
       "title-delete": "Eliminar"
     },
@@ -241,6 +251,9 @@
     "settings": {
       "info-description": "Estas definições de sistema são definidas em grafana.ini ou custom.ini (ou substituídas em variáveis ENV). Para alterar estas definições, tem de reiniciar a Grafana."
     },
+    "un-themed-org-row": {
+      "confirmText-confirm-removal": ""
+    },
     "upgrade-info": {
       "title": "Licença Enterprise"
     },
@@ -293,12 +306,17 @@
     },
     "user-permissions": {
       "change-button": "Alterar",
+      "confirmText-change": "",
       "grafana-admin-key": "Administrador da Grafana",
       "grafana-admin-no": "Não",
       "grafana-admin-yes": "Sim",
       "title": "Permissões"
     },
     "user-profile": {
+      "body-delete": "",
+      "body-disable": "",
+      "confirmText-delete-user": "",
+      "confirmText-disable-user": "",
       "delete-button": "Eliminar utilizador",
       "disable-button": "Inativar utilizador",
       "edit-button": "Editar",
@@ -312,6 +330,9 @@
       "title-delete-user": "Eliminar utilizador",
       "title-disable-user": "Inativar utilizador"
     },
+    "user-profile-row": {
+      "confirmText-save": ""
+    },
     "user-sessions": {
       "browser-column": "Navegador e SO",
       "force-logout-all-button": "Forçar o encerramento de sessão em todos os dispositivos",
@@ -461,6 +482,9 @@
       "label-muting-grouping-and-timings-optional": "Silêncio, agrupamento e tempos (opcional)",
       "title-muting-grouping-and-timings": "Silêncio, agrupamento e tempos"
     },
+    "alert-manager-picker": {
+      "noOptionsMessage-no-datasources-found": ""
+    },
     "alert-menu": {
       "copy-link": "Copiar link",
       "duplicate": "Duplicar",
@@ -550,6 +574,7 @@
       "view-configuration": "Ver configuração"
     },
     "alertmanager-config": {
+      "confirmText-yes-reset-configuration": "",
       "gma-manual-configuration-description": "A configuração interna do Grafana Alertmanager não pode ser alterada manualmente. Para alterar esta configuração, edite os recursos individuais através da interface do utilizador.",
       "gma-manual-configuration-is-not-supported": "Alterações da configuração manual não suportadas",
       "message": {
@@ -564,11 +589,13 @@
       "title-resetting-alertmanager-configuration": "A redefinir a configuração do Alertmanager"
     },
     "alertmanager-configuration-version-manager": {
+      "body-restore-configuration-version-unsaved-changes": "",
       "columns": {
         "compare": "Comparar",
         "restore": "Restaurar",
         "text-latest": "Mais recentes"
       },
+      "confirmText-yes-restore-configuration": "",
       "loading": "A carregar...",
       "no-previous-configurations": "Sem configurações anteriores",
       "this-might-take-a-while": "Isto pode demorar algum tempo...",
@@ -848,8 +875,10 @@
     },
     "contact-point-header": {
       "aria-label-more-actions": "Mais ações para o ponto de contacto \"{{contactPointName}}\"",
+      "ariaLabel-delete": "",
       "button-edit": "Editar",
       "button-view": "Ver",
+      "export-ariaLabel-export": "",
       "export-label-export": "Exportar",
       "label-delete": "Eliminar",
       "label-manage-permissions": "Gerir permissões",
@@ -1384,6 +1413,7 @@
       "label-disable-resolved-message": "Desativar mensagem resolvida"
     },
     "grafana-evaluation-behavior-step": {
+      "loadingMessage-loading-groups": "",
       "message": {
         "must-be-a-positive-integer": "Deve ser um número inteiro positivo.",
         "must-enter-a-group-name": "Deve inserir um nome de grupo"
@@ -1842,7 +1872,11 @@
             "other-data-sources": "Outras origens de dados"
           }
         }
-      }
+      },
+      "noOptionsMessage-no-datasources-found": ""
+    },
+    "mute-timing-actions-button": {
+      "body-delete-mute-timing": ""
     },
     "mute-timing-actions-buttons": {
       "text-disabled": "Desativado",
@@ -2093,9 +2127,11 @@
       "update-errors": {
         "conflict": "A árvore de políticas de notificação foi atualizada por outro utilizador.",
         "error-code": "Mensagem de erro: \"{{error}}\"",
-        "fallback": "Ocorreu um erro ao atualizar as suas políticas de notificação.",
+        "routes": {
+          "conflictingMatchers": ""
+        },
         "suffix": "Por favor, atualize a página e tente novamente.",
-        "title": "Erro ao guardar a política de notificação"
+        "title": ""
       },
       "n-more-policies_one": "{{count}} políticas adicionais",
       "n-more-policies_other": "{{count}} políticas adicionais"
@@ -2151,6 +2187,7 @@
     "query-and-expressions-step": {
       "add-query": "Adicionar consulta",
       "body-queries-expressions-configured": "Criar pelo menos uma consulta ou expressão para receber alertas de",
+      "confirmText-deactivate": "",
       "expressions": "Expressões",
       "loading-data-sources": "A carregar origens de dados...",
       "manipulate-returned-queries-other-operations": "Manipule os dados devolvidos das consultas com operações matemáticas e outras.",
@@ -2218,6 +2255,7 @@
     "redirect-to-clone-rule": {
       "body-evaluation-group": "Terá de definir um novo grupo de avaliação para a regra copiada, porque o original foi aprovisionado e não pode ser utilizado para regras criadas na interface do utilizador.",
       "body-not-provisioned": "A nova regra <1>não</1> será marcada como uma regra aprovisionada.",
+      "confirmText-copy": "",
       "title-copy-provisioned-alert-rule": "Copiar regra de alerta aprovisionada"
     },
     "redirect-to-rule-viewer": {
@@ -2415,8 +2453,6 @@
       "title-inspect-alert-rule": "Inspecionar regra de alerta"
     },
     "rule-list": {
-      "cannot-find-rule-details-for": "Não é possível encontrar detalhes da regra para a UID {{uid}}",
-      "cannot-load-rule-details-for": "Não é possível encontrar detalhes da regra para a UID {{uid}}",
       "configure-datasource": "Configurar",
       "draft-new-rule": "Elabore o rascunho de uma nova regra",
       "ds-error": {
@@ -2766,6 +2802,9 @@
       "existing-templates-selector-placeholder-choose-notification-template": "Escolher modelo de notificação",
       "loading": "A carregar...",
       "template-options": {
+        "ariaLabel": {
+          "select-notification-template": ""
+        },
         "label": {
           "select-notification-template": "Selecionar modelo de notificação"
         }
@@ -2792,6 +2831,8 @@
     },
     "templates-table": {
       "actions": "Ações",
+      "body-delete-template-group": "",
+      "confirmText-yes-delete": "",
       "no-templates-defined": "Nenhum modelo definido.",
       "template-group": "Grupo de modelos",
       "title-delete-template-group": "Eliminar grupo de modelos"
@@ -2919,6 +2960,11 @@
         "title-delete-contact-point": "Eliminar ponto de contacto"
       }
     },
+    "use-delete-modal": {
+      "modal": {
+        "confirmText-yes-delete": ""
+      }
+    },
     "use-delete-policy-modal": {
       "modal-element": {
         "title-delete-notification-policy": "Eliminar política de notificação"
@@ -3075,7 +3121,8 @@
     "annotation-field-mapper": {
       "annotation": "Anotação",
       "first-value": "Primeiro valor",
-      "from": ""
+      "from": "",
+      "noOptionsMessage-unknown-field-names": ""
     },
     "empty-state": {
       "button-title": "Adicionar consulta de anotação",
@@ -3209,7 +3256,7 @@
       "team-ids-github": "Lista de números inteiros de ID de equipa.",
       "team-ids-label": "ID de equipa",
       "team-ids-numbers": "As ID de equipa têm de ser números.",
-      "team-ids-other": "Lista de cadeias de ID de equipa.",
+      "team-ids-other": "",
       "team-ids-placeholder": "Introduza ID de equipa e prima Enter para adicionar",
       "teams-url-description": "O URL utilizado para consultar as ID de equipa. Se não estiver definido, o valor predefinido é de /equipas.",
       "teams-url-description-oauth": "Se configurar \"{{ teamsURLLabel }}\", tem também de configurar \"{{ teamIDsAttributePathLabel }}\".",
@@ -3253,6 +3300,7 @@
       "additional-actions-menu": {
         "label-reset-to-default-values": "Redefinir para os valores predefinidos"
       },
+      "confirmText-reset": "",
       "disable": "Desativar",
       "disabling": "A desativar...",
       "discard": "Descartar",
@@ -4180,8 +4228,8 @@
     }
   },
   "dashbaord-scene": {
-    "interval-variable-form": {
-      "description-auto-option": "Calcula dinamicamente o intervalo ao dividir o intervalo de tempo pela contagem especificada"
+    "variable-editor-form": {
+      "run-query": ""
     }
   },
   "dashboard": {
@@ -4343,6 +4391,9 @@
     },
     "dash-nav": {
       "on-open-snapshot-original": {
+        "confirmText": {
+          "proceed": ""
+        },
         "title": {
           "proceed-to-external-site": "Continuar para o site externo?"
         }
@@ -4557,6 +4608,13 @@
           "editable": "Editável",
           "readonly": "Apenas de leitura"
         }
+      },
+      "graph_tooltip_options": {
+        "label": {
+          "default": "",
+          "shared-crosshair": "",
+          "shared-tooltip": ""
+        }
       }
     },
     "get-debug-dashboard": {
@@ -4861,6 +4919,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "Tem a certeza de que pretende restaurar o painel de controlo para a versão {{version}}? Todas as alterações não guardadas serão perdidas.",
+      "confirmText-restore-version": "",
       "title-restore-version": "Restaurar versão"
     },
     "row-options-button": {
@@ -4911,6 +4970,9 @@
         "title-not-unique": "Este título não é único"
       }
     },
+    "save-dashboard": {
+      "message-dashboard-saved": ""
+    },
     "save-dashboard-as-button": {
       "save-as": "Guardar como"
     },
@@ -4945,6 +5007,7 @@
     "save-dashboard-error-proxy": {
       "body-name-exists": "Já existe um painel de controlo com o mesmo nome na pasta selecionada.<1></1><2>Ainda pretende guardar este painel de controlo?</2>",
       "body-version-mismatch": "Outra pessoa atualizou este painel de controlo<1></1><2>Ainda pretende guardar este painel de controlo?</2>",
+      "confirmText-save-and-overwrite": "",
       "title-name-exists": "Conflito",
       "title-version-mismatch": "Conflito"
     },
@@ -5141,7 +5204,9 @@
       "label-apply-transformation-to": "Aplicar transformação a"
     },
     "transformation-operation-row": {
+      "body-delete": "",
       "render-actions": {
+        "confirmText-delete": "",
         "title-debug": "Depurar",
         "title-disable-transformation": "Desativar transformação",
         "title-filter": "Filtro",
@@ -5163,10 +5228,14 @@
       "show-images": "Mostrar imagens",
       "title-add-another-transformation": "Adicionar outra transformação"
     },
+    "un-theme-transformations-editor": {
+      "body-delete-all-transformations": ""
+    },
     "un-themed-transformations-editor": {
       "actions": {
         "add-another-transformation": "Adicionar outra transformação"
       },
+      "confirmText-delete-all": "",
       "delete-all-transformations": "Eliminar todas as transformações",
       "title-delete-all-transformations": "Eliminar todas as transformações?",
       "tooltip-clear-search": "Limpar a pesquisa",
@@ -5203,6 +5272,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "Alternar seleção da versão {{version}}",
       "date": "Data",
+      "name-latest": "",
       "notes": "Observações",
       "restore": "Restaurar",
       "updated-by": "Atualizado por",
@@ -5279,7 +5349,8 @@
       "description-enables-users-custom-values": "Permite que os utilizadores adicionem valores personalizados à lista",
       "description-provide-dimensions-as-csv-dimension-name-dimension-id": "Forneça dimensões como CSV: {{name}}, {{value}}",
       "label-data-source": "Origem dos dados",
-      "label-use-static-key-dimensions": "Utilizar dimensões de chave estática"
+      "label-use-static-key-dimensions": "Utilizar dimensões de chave estática",
+      "name-allow-custom-values": ""
     },
     "add-to-dashboard": {
       "message": {
@@ -5352,6 +5423,9 @@
       }
     },
     "config-public-dashboard": {
+      "confirmText": {
+        "revoke-public-url": ""
+      },
       "title": {
         "revoke-public-url": "Revogar URL público"
       }
@@ -5363,6 +5437,7 @@
     },
     "custom-variable-form": {
       "custom-options": "Opções personalizadas",
+      "name-values-separated-comma": "",
       "selection-options": "Opções de seleção"
     },
     "dashboard-edit-pane-renderer": {
@@ -5381,6 +5456,12 @@
       "label-type": "Tipo",
       "label-url": "URL",
       "label-with-tags": "Com etiquetas",
+      "link-type-options": {
+        "label": {
+          "dashboards": "",
+          "link": ""
+        }
+      },
       "placeholder-open-dashboard": "Abrir painel de controlo"
     },
     "dashboard-link-list": {
@@ -5427,6 +5508,8 @@
       "data-source-options": "Opções de origem de dados",
       "description-instance-name-filter": "Filtro regex para as instâncias de origem de dados a escolher na lista de valores de variáveis. Deixe em branco para todos.",
       "example-instance-name-filter": "Exemplo: <codeExample />",
+      "name-instance-name-filter": "",
+      "name-type": "",
       "selection-options": "Opções de seleção"
     },
     "default-grid-layout-manager": {
@@ -5472,6 +5555,21 @@
     "empty-transformations-message": {
       "add-transformation": "Adicionar transformação"
     },
+    "general-settings-edit-view": {
+      "editable_options": {
+        "label": {
+          "editable": "",
+          "readonly": ""
+        }
+      },
+      "graph_tooltip_options": {
+        "label": {
+          "default": "",
+          "shared-crosshair": "",
+          "shared-tooltip": ""
+        }
+      }
+    },
     "get-edit-options": {
       "title": {
         "column-options": "Opções de coluna",
@@ -5502,7 +5600,8 @@
       "description-provide-dimensions-as-csv-dimension-name-dimension-id": "Forneça dimensões como CSV: {{name}}, {{value}}",
       "group-by-options": "Agrupar por opções",
       "label-data-source": "Origem dos dados",
-      "label-use-static-group-by-dimensions": "Utilizar dimensões de grupo estático"
+      "label-use-static-group-by-dimensions": "Utilizar dimensões de grupo estático",
+      "name-allow-custom-values": ""
     },
     "help-wizard": {
       "copy-to-clipboard": "Copiar para a área de transferência",
@@ -5538,9 +5637,14 @@
       "apply": "Aplicar"
     },
     "interval-variable-form": {
+      "description-auto-option": "",
       "description-calculated-value-below-threshold": "O valor calculado não irá abaixo deste limite",
       "description-step-count": "Quantas vezes o intervalo de tempo atual deve ser dividido para calcular o valor",
-      "interval-options": "Opções de intervalo"
+      "interval-options": "Opções de intervalo",
+      "name-auto-option": "",
+      "name-min-interval": "",
+      "name-step-count": "",
+      "name-values": ""
     },
     "json-model-edit-view": {
       "cancel-button": {
@@ -5565,6 +5669,9 @@
       "title-name-already-exists": "Nome já existente"
     },
     "on-open-snapshot-original-dashboard": {
+      "confirmText": {
+        "proceed": ""
+      },
       "title": {
         "proceed-to-external-site": "Continuar para o site externo?"
       }
@@ -5600,6 +5707,8 @@
     },
     "panel-data-transformations-tab-rendered": {
       "add-another-transformation": "Adicionar outra transformação",
+      "body-delete-all-transformations": "",
+      "confirmText-delete-all": "",
       "delete-all-transformations": "Eliminar todas as transformações",
       "title-delete-all-transformations": "Eliminar todas as transformações?"
     },
@@ -5653,6 +5762,7 @@
       "description-optional": "Opcional, se pretender extrair parte de um nome de série ou segmento de nó métrico.",
       "label-data-source": "Origem dos dados",
       "label-target-data-source": "Origem de dados de destino",
+      "name-regex": "",
       "query-options": "Opções de consulta",
       "selection-options": "Opções de seleção"
     },
@@ -5667,6 +5777,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "Tem a certeza de que pretende restaurar o painel de controlo para a versão {{version}}? Todas as alterações não guardadas serão perdidas.",
+      "confirmText-restore-version": "",
       "title-restore-version": "Restaurar versão"
     },
     "save-button": {
@@ -5760,7 +5871,11 @@
     "selection-options-form": {
       "description-enables-multiple-values-selected": "Permite que vários valores sejam selecionados ao mesmo tempo",
       "description-enables-option-include-variables": "Ativa uma opção para incluir todos os valores",
-      "description-enables-users-custom-values": "Permite que os utilizadores adicionem valores personalizados à lista"
+      "description-enables-users-custom-values": "Permite que os utilizadores adicionem valores personalizados à lista",
+      "name-allow-custom-values": "",
+      "name-custom-all-value": "",
+      "name-include-all-option": "",
+      "name-multi-value": ""
     },
     "share-button": {
       "aria-label-sharedropdownmenu": "Alternar menu de partilha"
@@ -5780,6 +5895,9 @@
         "copy-to-clipboard-failed": "A cópia para a área de transferência falhou"
       }
     },
+    "text-box-variable": {
+      "name-default-value": ""
+    },
     "text-box-variable-form": {
       "placeholder-default-value-if-any": "(opcional)",
       "text-options": "Opções de texto"
@@ -5803,6 +5921,8 @@
       }
     },
     "unlink-modal": {
+      "body-unlink-panel": "",
+      "confirmText-yes-unlink": "",
       "title-really-unlink-panel": "Tem a certeza de que pretende desassociar este painel?"
     },
     "unsaved-changes-modal": {
@@ -5819,6 +5939,9 @@
         }
       }
     },
+    "use-save-dashboard": {
+      "message-dashboard-saved": ""
+    },
     "variable-check-indicator": {
       "aria-label-variable-referenced-dashboard": "Esta variável não é referenciada por nenhuma variável ou por nenhum painel de controlo.",
       "aria-label-variable-referenced-other-variables-dashboard": "Esta variável é referenciada por outras variáveis ou outros painel de controlo.",
@@ -5828,10 +5951,16 @@
     "variable-editor-form": {
       "aria-label-variable-editor-form": "Formulário do editor de variáveis",
       "back-to-list": "Voltar à lista",
+      "confirmText": {
+        "delete-variable": ""
+      },
       "delete": "Eliminar",
       "description-optional-display-name": "Nome de exibição opcional",
       "description-template-variable-characters": "O nome da variável do modelo. (máx. 50 caracteres)",
       "general": "Geral",
+      "name-description": "",
+      "name-label": "",
+      "name-name": "",
       "placeholder-descriptive-text": "Texto descritivo",
       "placeholder-label-name": "Nome da etiqueta",
       "placeholder-variable-name": "Nome da variável",
@@ -5846,13 +5975,25 @@
       "variable": "Variável"
     },
     "variable-editor-list-row": {
+      "body-delete-variable": "",
+      "confirmText-delete-variable": "",
       "title-delete-variable": "Eliminar variável",
       "tooltip-duplicate-variable": "Variável duplicada",
       "tooltip-remove-variable": "Remover variável"
     },
     "variable-hide-select": {
+      "hide_options": {
+        "label": {
+          "label": "",
+          "nothing": "",
+          "variable": ""
+        }
+      },
       "label": "Ocultar"
     },
+    "variable-type-select": {
+      "name-variable-type": ""
+    },
     "variable-usages-button": {
       "title-show-usages": "A mostrar as utilizações para: {{variableId}}",
       "tooltip-show-usages": "Mostrar utilizações"
@@ -5879,6 +6020,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "Alternar seleção da versão {{version}}",
       "date": "Data",
+      "name-latest": "",
       "notes": "Observações",
       "restore": "Restaurar",
       "updated-by": "Atualizado por",
@@ -6266,7 +6408,8 @@
       }
     },
     "color-dimension-editor": {
-      "label-fixed-color": ""
+      "label-fixed-color": "",
+      "noOptionsMessage-no-fields-found": ""
     },
     "file-dropzone-custom-children": {
       "upload": "Carregar"
@@ -6304,6 +6447,7 @@
       },
       "label-limit": "Limite",
       "label-value": "Valor",
+      "noOptionsMessage-no-fields-found": "",
       "scalar-options": {
         "description-clamped": "",
         "description-mod": "",
@@ -6312,9 +6456,15 @@
       }
     },
     "scale-dimension-editor": {
+      "fixed-value-option": {
+        "label": {
+          "fixed-value": ""
+        }
+      },
       "label-max": "Máx.",
       "label-min": "Mín.",
-      "label-value": "Valor"
+      "label-value": "Valor",
+      "noOptionsMessage-no-fields-found": ""
     },
     "text-dimension-editor": {
       "description-field": "",
@@ -6886,6 +7036,8 @@
       "aria-label-select-service-name-operator": "Selecionar o operador do nome do serviço",
       "aria-label-select-span-name": "Selecionar o nome do intervalo",
       "aria-label-select-span-name-operator": "Selecionar o operador do nome do intervalo",
+      "ariaLabel-select-max-span-duration": "",
+      "ariaLabel-select-min-span-duration": "",
       "label-collapse": "Filtros de intervalo",
       "label-duration": "Duração",
       "label-service-name": "Nome do serviço",
@@ -6956,6 +7108,8 @@
       "split-widen": "Alargar painel"
     },
     "trace-page-actions": {
+      "ariaLabel-copy-trace-id": "",
+      "ariaLabel-export-trace": "",
       "give-feedback": "Dar feedback",
       "label-copied": "Copiado!",
       "label-export": "Exportar",
@@ -7093,6 +7247,7 @@
   },
   "folder-filter": {
     "clear-folder-button": "Limpar pastas",
+    "noOptionsMessage-no-folders-found": "",
     "select-aria-label": "Filtro de pastas",
     "select-placeholder": "Filtrar por pasta"
   },
@@ -7161,7 +7316,53 @@
     "incomplete-request-error": "Lamentamos, mas não foi possível concluir o seu pedido. Tente novamente.",
     "send-custom-feedback": "Enviar"
   },
+  "geo": {
+    "get-geometry-field": {
+      "warning-gazetteer-not-found": "",
+      "warning-no-geometry": "",
+      "warning-select-geohash": "",
+      "warning-select-lat-long": "",
+      "warning-select-lookup": "",
+      "warning-unable-to-find": ""
+    },
+    "location-editor": {
+      "geohash-field": {
+        "no-fields-message": ""
+      },
+      "latitude-field": {
+        "no-fields-message": ""
+      },
+      "longitude-field": {
+        "no-fields-message": ""
+      },
+      "lookup-field": {
+        "no-fields-message": ""
+      },
+      "name-gazetteer": "",
+      "name-geohash-field": "",
+      "name-latitude-field": "",
+      "name-location-mode": "",
+      "name-longitude-field": "",
+      "name-lookup-field": ""
+    },
+    "location-more-editor": {
+      "mode-options": {
+        "description-auto": "",
+        "description-coords": "",
+        "description-geohash": "",
+        "description-lookup": "",
+        "label-auto": "",
+        "label-coords": "",
+        "label-geohash": "",
+        "label-lookup": ""
+      }
+    }
+  },
   "geomap": {
+    "category-basemap-layer": "",
+    "category-map-controls": "",
+    "category-map-layers": "",
+    "category-map-view": "",
     "coordinates-map-view-editor": {
       "label-latitude": "Latitude",
       "label-longitude": "Longitude"
@@ -7170,6 +7371,14 @@
       "center": "Centro:",
       "zoom": "Ampliar:"
     },
+    "description-initial-view": "",
+    "description-mouse-wheel-zoom": "",
+    "description-share-view": "",
+    "description-show-attribution": "",
+    "description-show-debug": "",
+    "description-show-measure": "",
+    "description-show-scale": "",
+    "description-show-zoom": "",
     "fit-map-view-editor": {
       "all-layers-editor-fragment": {
         "label-layer": "Camada"
@@ -7192,6 +7401,14 @@
     "geomap-style-rules-editor": {
       "aria-label-add-geomap-style-rule": "Adicionar regra de estilo geomap"
     },
+    "layer-editor": {
+      "category-base-layer": "",
+      "description-display-tooltip": "",
+      "name-data": "",
+      "name-display-tooltip": "",
+      "name-layer-type": "",
+      "name-opacity": ""
+    },
     "layers-editor": {
       "label-add-layer": "Adicionar camada",
       "no-layers": "Sem camadas?"
@@ -7202,16 +7419,38 @@
       "label-zoom": "Zoom",
       "use-current-map-settings": "Utilizar as definições atuais do mapa"
     },
+    "markers-layer": {
+      "description-show-legend": "",
+      "name-show-legend": "",
+      "name-styles": ""
+    },
     "markers-legend": {
       "title-symbol": "Símbolo"
     },
     "measure-overlay": {
       "tooltip-show-measure-tools": "Mostrar ferramentas de medição"
     },
+    "name-initial-view": "",
+    "name-mouse-wheel-zoom": "",
+    "name-share-view": "",
+    "name-show-attribution": "",
+    "name-show-debug": "",
+    "name-show-measure": "",
+    "name-show-scale": "",
+    "name-show-zoom": "",
+    "name-tooltip": "",
+    "photos-layer": {
+      "noFieldsMessage-no-string-fields": ""
+    },
     "plugin": {
       "basemap-layer-configured-server-admin": "A camada do mapa base é configurada pelo administrador do servidor."
     },
     "style-editor": {
+      "horizontal-align-options": {
+        "label-center": "",
+        "label-left": "",
+        "label-right": ""
+      },
       "label-align": "Alinhar",
       "label-baseline": "Linha de base",
       "label-color": "Cor",
@@ -7225,7 +7464,14 @@
       "label-symbol-vertical-align": "Alinhamento vertical do símbolo",
       "label-text-label": "Etiqueta de texto",
       "label-x-offset": "Deslocamento de X",
-      "label-y-offset": "Deslocamento de Y"
+      "label-y-offset": "Deslocamento de Y",
+      "placeholderText-select-symbol": "",
+      "placeholderText-select-symbol-or-add-text": "",
+      "vertical-align-options": {
+        "label-bottom": "",
+        "label-center": "",
+        "label-top": ""
+      }
     },
     "style-rule-editor": {
       "aria-label-comparison-operator": "Operador de comparação",
@@ -7236,6 +7482,15 @@
       "placeholder-feature-property": "Propriedade em destaque",
       "placeholder-numeric-value": "Valor numérico",
       "placeholder-value": "valor"
+    },
+    "tooltip-options": {
+      "description-details": "",
+      "description-none": "",
+      "label-details": "",
+      "label-none": ""
+    },
+    "utils": {
+      "get-next-layer-name": ""
     }
   },
   "get-enterprise": {
@@ -7485,7 +7740,8 @@
       "aria-label-selected-color": "cor {{colorLabel}} "
     },
     "confirm-button": {
-      "cancel": "Cancelar"
+      "cancel": "Cancelar",
+      "confirmText-delete": ""
     },
     "confirm-content": {
       "placeholder": "Digite \"{{confirmPromptText}}\" para confirmar"
@@ -7667,6 +7923,8 @@
     },
     "panel-chrome": {
       "aria-label-toggle-collapse": "alternar painel de recolha",
+      "ariaLabel-panel-loading": "",
+      "ariaLabel-panel-status": "",
       "tooltip-cancel": "Cancelar consulta",
       "tooltip-cancel-loading": "Cancelar consulta",
       "tooltip-stop-streaming": "Parar a transmissão",
@@ -7834,6 +8092,12 @@
       "footer-click-to-action": "Clique para {{actionTitle}}",
       "footer-click-to-navigate": "Clique para abrir {{linkTitle}}",
       "timestamp": "Registo de data e hora"
+    },
+    "week-start-picker": {
+      "weekStarts-label-default": "",
+      "weekStarts-label-monday": "",
+      "weekStarts-label-saturday": "",
+      "weekStarts-label-sunday": ""
     }
   },
   "graph": {
@@ -8212,6 +8476,10 @@
     "add-library-panel-modal": {
       "title-create-library-panel": "Criar painel de biblioteca"
     },
+    "change-library-panel-modal": {
+      "confirmText-change": "",
+      "confirmText-replace": ""
+    },
     "confirm": {
       "delete-panel": "Pretende eliminar este painel?"
     },
@@ -8656,6 +8924,8 @@
       "updated-on": "Atualizado a"
     },
     "snapshot-list-table": {
+      "body-delete": "",
+      "confirmText-delete": "",
       "title-delete": "Eliminar"
     },
     "unthemed-dashboard-import": {
@@ -8667,6 +8937,9 @@
       }
     }
   },
+  "metric-select": {
+    "noOptionsMessage-no-options-found": ""
+  },
   "migrate-to-cloud": {
     "build-snapshot": {
       "description": "Esta ferramenta pode migrar alguns recursos desta instalação para a sua pilha de nuvem. Para começar, terá de criar um instantâneo desta instalação. A criação de um instantâneo geralmente demora menos de dois minutos. O instantâneo é armazenado juntamente com esta instalação da Grafana.",
@@ -9365,7 +9638,7 @@
     "marker": {
       "100-node-count": ">100 nós",
       "aria-label-hidden-marker": "Marcador de nós ocultos: {{marker}}",
-      "node-count_one": "{{count}} nó",
+      "node-count_one": "{{count}} nós",
       "node-count_other": "{{count}} nós"
     },
     "node": {
@@ -9376,9 +9649,9 @@
       "aria-label-nodes-hidden-warning": "Aviso de nós ocultos",
       "computing-layout": "Layout de computação",
       "no-data": "Sem dados",
-      "hidden-nodes_one": "<0></0> {{count}} nó está oculto por razões de desempenho.",
+      "hidden-nodes_one": "<0></0> {{count}} nós estão ocultos por razões de desempenho.",
       "hidden-nodes_other": "<0></0> {{count}} nós estão ocultos por razões de desempenho.",
-      "processed-nodes_one": "<0></0> O layout em camadas pode ser lento com {{count}} nó.",
+      "processed-nodes_one": "<0></0> O layout em camadas pode ser lento com {{count}} nós.",
       "processed-nodes_other": "<0></0> O layout em camadas pode ser lento com {{count}} nós."
     },
     "node-graph-panel": {
@@ -9505,6 +9778,7 @@
     }
   },
   "org-picker": {
+    "noOptionsMessage-no-organizations-found": "",
     "select-placeholder": "Selecionar organização"
   },
   "page": {
@@ -9727,6 +10001,7 @@
         "permission": "Não possui permissão para ver esta página.",
         "title-access-denied": "Acesso negado"
       },
+      "error-loading-plugin": "",
       "no-root-app-page-component-found": "Não foi encontrado nenhum componente de página de aplicação de nível superior"
     },
     "browse": {
@@ -9770,8 +10045,7 @@
         "update-status-text": "plugins atualizados"
       },
       "versions": {
-        "confirmation-text-1": "Tem a certeza de que pretende fazer o downgrade para a versão",
-        "confirmation-text-2": "Normalmente, não deveria estar a fazer isto",
+        "confirmation-text": "",
         "downgrade-confirm": "Downgrade",
         "downgrade-title": "Fazer o downgrade da versão do plugin"
       }
@@ -9825,6 +10099,10 @@
     "empty-state": {
       "message": "Nenhum plugin encontrado"
     },
+    "extensions": {
+      "extension-error-alert-description": "",
+      "extension-error-alert-title": ""
+    },
     "extensions-log-data-source": {
       "message": {
         "ok": "OK"
@@ -9858,7 +10136,11 @@
       "updating": "A atualizar"
     },
     "install-controls-button": {
-      "title-uninstall-modal": "Desinstalar {{plugin}}"
+      "title-uninstall-modal": "Desinstalar {{plugin}}",
+      "uninstall-controls": {
+        "body-uninstall-plugin": "",
+        "confirmText-confirm": ""
+      }
     },
     "install-controls-warning": {
       "body-not-published": "Este plugin não está publicado em <2>grafana.com/plugins</2> e não pode ser gerido através do catálogo.",
@@ -10894,6 +11176,7 @@
     }
   },
   "service-account-picker": {
+    "noOptionsMessage-no-service-accounts-found": "",
     "select-aria-label": "Selecionador da conta de serviço",
     "select-placeholder": "Comece a escrever para pesquisar contas de serviço"
   },
@@ -10939,6 +11222,10 @@
     },
     "service-account-page-unconnected": {
       "add-service-account-token": "Adicionar token da conta de serviço",
+      "body-delete-service-account": "",
+      "body-disable-service-account": "",
+      "confirmText-delete-service-account": "",
+      "confirmText-disable-service-account": "",
       "delete-service-account": "Eliminar a conta de serviço",
       "disable-service-account": "Desativar a conta de serviço",
       "enable-service-account": "Ativar a conta de serviço",
@@ -10965,6 +11252,7 @@
       "used-by": "Utilizado por"
     },
     "service-account-profile-row": {
+      "confirmText-save": "",
       "edit": "Editar"
     },
     "service-account-role-row": {
@@ -10978,10 +11266,16 @@
     },
     "service-accounts-list-page-unconnected": {
       "add-service-account": "Adicionar conta de serviço",
+      "body-delete-with-tokens": "",
+      "body-disable-service-account": "",
+      "confirmText-delete": "",
+      "confirmText-disable-service-account": "",
       "placeholder-search-service-account-by-name": "Pesquisar uma conta de serviço por nome",
       "sub-title": "As contas de serviço e os seus tokens podem ser utilizados para autenticar na API da Grafana. Saiba mais na nossa <2>documentação.</2>",
       "title-delete-service-account": "Eliminar a conta de serviço",
-      "title-disable-service-account": "Desativar a conta de serviço"
+      "title-disable-service-account": "Desativar a conta de serviço",
+      "body-delete_one": "",
+      "body-delete_other": ""
     },
     "token-expiration": {
       "content-this-token-has-expired": "Este token expirou",
@@ -11373,7 +11667,7 @@
       "label-never": ""
     },
     "status-history-panel": {
-      "too-many-points_one": "Demasiados pontos para visualizar corretamente. <1></1>Atualizar a consulta para devolver menos pontos. <3></3>({{count}} ponto recebido)",
+      "too-many-points_one": "Demasiados pontos para visualizar corretamente. <1></1>Atualizar a consulta para devolver menos pontos. <3></3>({{count}} pontos recebidos)",
       "too-many-points_other": "Demasiados pontos para visualizar corretamente. <1></1>Atualizar a consulta para devolver menos pontos. <3></3>({{count}} pontos recebidos)"
     }
   },
@@ -11518,6 +11812,7 @@
     "tag-option-label": "Opção de etiqueta"
   },
   "team-picker": {
+    "noOptionsMessage-no-teams-found": "",
     "select-aria-label": "Seletor de equipa",
     "select-placeholder": "Selecione uma equipa"
   },
@@ -11843,6 +12138,7 @@
     "convert-field-type-transformer-editor": {
       "aria-label-add-a-convert-field-type-transformer": "Adicionar um transformador de tipo de campo convert",
       "aria-label-remove-convert-field-type-transformer": "Remover transformador de tipo de campo convert",
+      "convert-field-type": "",
       "label": {
         "browser": "Navegador",
         "utc": "UTC"
@@ -11885,6 +12181,11 @@
       "remove-enum-row-tooltip-delete": "Eliminar"
     },
     "extract-fields-transformer-editor": {
+      "field-name-picker-settings": {
+        "placeholderText": {
+          "select-field": ""
+        }
+      },
       "label-delimiter": "Delimitador",
       "label-format": "Formato",
       "label-keep-time": "Registar tempo",
@@ -11898,6 +12199,14 @@
       "aria-label-threshold-color": "Cor do limite"
     },
     "field-lookup-transformer-editor": {
+      "field-name-picker-settings": {
+        "noFieldsMessage": {
+          "no-text-fields-found": ""
+        },
+        "placeholderText": {
+          "select-text-field": ""
+        }
+      },
       "label-field": "Campo",
       "label-lookup": "Pesquisar"
     },
@@ -11923,10 +12232,30 @@
     },
     "filter-by-value-transformer-editor": {
       "add-condition": "Adicionar condição",
+      "filter-match": {
+        "label": {
+          "match-all": "",
+          "match-any": ""
+        }
+      },
+      "filter-types": {
+        "label": {
+          "exclude": "",
+          "include": ""
+        }
+      },
       "label-conditions": "Condições",
       "label-filter-type": "Tipo de filtro"
     },
     "format-string-transfomer-editor": {
+      "field-name-picker-settings": {
+        "noFieldsMessage": {
+          "no-text-fields-found": ""
+        },
+        "placeholderText": {
+          "select-text-field": ""
+        }
+      },
       "label-field": "Campo",
       "label-format": "Formato",
       "label-substring-range": "Intervalo de subcadeia"
@@ -12237,6 +12566,7 @@
     "title": "Organizações"
   },
   "user-picker": {
+    "noOptionsMessage-no-users-found": "",
     "select-aria-label": "Seletor de utilizador",
     "select-placeholder": "Começar a digitar para pesquisar utilizador"
   },
@@ -12322,6 +12652,8 @@
       }
     },
     "confirm-delete-modal": {
+      "body-delete-variable": "",
+      "confirmText-delete": "",
       "title-delete-variable": "Eliminar variável"
     },
     "create-ad-hoc-variable-adapter": {
@@ -12370,9 +12702,24 @@
       "label-refresh": "Atualizar"
     },
     "query-variable-sort-select": {
-      "description-values-variable": "Como ordenar os valores desta variável"
+      "description-values-variable": "Como ordenar os valores desta variável",
+      "name-sort": "",
+      "sort_options": {
+        "label": {
+          "alphabetical-asc": "",
+          "alphabetical-caseinsensitive-asc": "",
+          "alphabetical-caseinsensitive-desc": "",
+          "alphabetical-desc": "",
+          "disabled": "",
+          "natural-asc": "",
+          "natural-desc": "",
+          "numerical-asc": "",
+          "numerical-desc": ""
+        }
+      }
     },
     "text-box-variable-editor": {
+      "name-default-value": "",
       "placeholder-default-value-if-any": "valor predefinido, se houver",
       "text-options": "Opções de texto"
     },
@@ -12401,6 +12748,8 @@
       "description-optional-display-name": "Nome de exibição opcional",
       "description-template-variable-characters": "O nome da variável do modelo. (máx. 50 caracteres)",
       "general": "Geral",
+      "name-label": "",
+      "name-name": "",
       "placeholder-descriptive-text": "Texto descritivo",
       "placeholder-label-name": "Nome da etiqueta",
       "placeholder-variable-name": "Nome da variável",
@@ -12415,9 +12764,15 @@
       "tooltip-duplicate-variable": "Variável duplicada",
       "tooltip-remove-variable": "Remover variável"
     },
+    "variable-editor-un-connected": {
+      "name-description": ""
+    },
     "variable-options": {
       "aria-label-toggle-all-values": "Alternar todos os valores"
     },
+    "variable-type-select": {
+      "name-select-variable-type": ""
+    },
     "variable-usages-button": {
       "tooltip-show-usages": "Mostrar utilizações"
     },
diff --git a/public/locales/ru-RU/grafana.json b/public/locales/ru-RU/grafana.json
index b22ba9ec123..d5eb61aad8f 100644
--- a/public/locales/ru-RU/grafana.json
+++ b/public/locales/ru-RU/grafana.json
@@ -84,6 +84,7 @@
     "admin-feature-toggles-table": {
       "confirm-modal-body-1": "Одни функции работают в стабильном режиме (GA) и включены по умолчанию, а другие находятся на стадии предварительной бета-версии, доступной для раннего использования.",
       "confirm-modal-body-2": "Прежде чем вносить изменения, рекомендуем ознакомиться с их последствиями для каждой функции.",
+      "confirmText-save-changes": "",
       "get-stage-cell": {
         "beta": "Бета",
         "content-general-availability": "Общедоступность",
@@ -96,14 +97,21 @@
     },
     "admin-orgs-table": {
       "aria-label-delete-org": "Удалить организацию",
+      "confirmText-delete": "",
       "title-delete": "Удаление"
     },
     "anon-users": {
       "not-found": "Анонимные пользователи не найдены."
     },
     "base-user-sessions": {
+      "body-force-logout-from-all-devices": "",
+      "confirmText-confirm-logout": "",
+      "confirmText-force-logout": "",
       "title-force-logout-from-all-devices": "Принудительный выход на всех устройствах"
     },
+    "change-org-button": {
+      "confirmText-save": ""
+    },
     "edit-org": {
       "access-denied": "У вас нет разрешения на просмотр пользователей в этой организации. Чтобы обновить данные этой организации, обратитесь к администратору сервера.",
       "heading": "Редактирование организации",
@@ -208,9 +216,11 @@
       "not-editable": "Роль этого пользователя не редактируется, поскольку она синхронизируется с провайдером аутентификации. Подробнее см. в <1>документации по аутентификации Grafana</1>."
     },
     "org-users-table": {
+      "body-delete": "",
       "columns": {
         "aria-label-role": "Роль"
       },
+      "confirmText-delete": "",
       "delete-aria-label": "Удалить пользователя: {{name}}",
       "title-delete": "Удаление"
     },
@@ -241,6 +251,9 @@
     "settings": {
       "info-description": "Эти параметры настройки системы заданы в файле grafana.ini или custom.ini (или переопределены в переменных ENV). Чтобы изменить их, необходимо перезапустить Grafana."
     },
+    "un-themed-org-row": {
+      "confirmText-confirm-removal": ""
+    },
     "upgrade-info": {
       "title": "Лицензия Enterprise"
     },
@@ -293,12 +306,17 @@
     },
     "user-permissions": {
       "change-button": "Изменить",
+      "confirmText-change": "",
       "grafana-admin-key": "Администратор Grafana",
       "grafana-admin-no": "Нет",
       "grafana-admin-yes": "Да",
       "title": "Разрешения"
     },
     "user-profile": {
+      "body-delete": "",
+      "body-disable": "",
+      "confirmText-delete-user": "",
+      "confirmText-disable-user": "",
       "delete-button": "Удалить пользователя",
       "disable-button": "Отключить пользователя",
       "edit-button": "Редактировать",
@@ -312,6 +330,9 @@
       "title-delete-user": "Удаление пользователя",
       "title-disable-user": "Отключение пользователя"
     },
+    "user-profile-row": {
+      "confirmText-save": ""
+    },
     "user-sessions": {
       "browser-column": "Браузер и ОС",
       "force-logout-all-button": "Принудительный выход на всех устройствах",
@@ -469,6 +490,9 @@
       "label-muting-grouping-and-timings-optional": "Отключение звука, группировка и определение времени (необязательно)",
       "title-muting-grouping-and-timings": "Отключение звука, группировка и определение времени"
     },
+    "alert-manager-picker": {
+      "noOptionsMessage-no-datasources-found": ""
+    },
     "alert-menu": {
       "copy-link": "Копировать ссылку",
       "duplicate": "Дублировать",
@@ -558,6 +582,7 @@
       "view-configuration": "Просмотр конфигурации"
     },
     "alertmanager-config": {
+      "confirmText-yes-reset-configuration": "",
       "gma-manual-configuration-description": "Внутреннюю конфигурацию обработчика оповещений Grafana Alertmanager невозможно изменить вручную. Чтобы изменить конфигурацию, измените отдельные ресурсы через пользовательский интерфейс.",
       "gma-manual-configuration-is-not-supported": "Изменения конфигурации вручную не поддерживаются",
       "message": {
@@ -572,11 +597,13 @@
       "title-resetting-alertmanager-configuration": "Сброс конфигурации обработчика оповещений Alertmanager"
     },
     "alertmanager-configuration-version-manager": {
+      "body-restore-configuration-version-unsaved-changes": "",
       "columns": {
         "compare": "Сравнить",
         "restore": "Восстановить",
         "text-latest": "Последние"
       },
+      "confirmText-yes-restore-configuration": "",
       "loading": "Загрузка…",
       "no-previous-configurations": "Нет предыдущих конфигураций",
       "this-might-take-a-while": "Это может занять некоторое время...",
@@ -856,8 +883,10 @@
     },
     "contact-point-header": {
       "aria-label-more-actions": "Другие действия для точки контакта «{{contactPointName}}»",
+      "ariaLabel-delete": "",
       "button-edit": "Редактировать",
       "button-view": "Просмотр",
+      "export-ariaLabel-export": "",
       "export-label-export": "Экспорт",
       "label-delete": "Удалить",
       "label-manage-permissions": "Управление разрешениями",
@@ -1396,6 +1425,7 @@
       "label-disable-resolved-message": "Отключить сообщение об устранении"
     },
     "grafana-evaluation-behavior-step": {
+      "loadingMessage-loading-groups": "",
       "message": {
         "must-be-a-positive-integer": "Должно быть положительным целым числом.",
         "must-enter-a-group-name": "Необходимо ввести название группы"
@@ -1856,7 +1886,11 @@
             "other-data-sources": "Другие источники данных"
           }
         }
-      }
+      },
+      "noOptionsMessage-no-datasources-found": ""
+    },
+    "mute-timing-actions-button": {
+      "body-delete-mute-timing": ""
     },
     "mute-timing-actions-buttons": {
       "text-disabled": "Отключено",
@@ -2109,9 +2143,11 @@
       "update-errors": {
         "conflict": "Другой пользователь обновил дерево политик уведомления.",
         "error-code": "Сообщение об ошибке: «{{error}}»",
-        "fallback": "Ошибка при обновлении политик уведомления.",
+        "routes": {
+          "conflictingMatchers": ""
+        },
         "suffix": "Обновите страницу и повторите попытку.",
-        "title": "Ошибка при сохранении политики уведомления"
+        "title": ""
       },
       "n-more-policies_one": "{{count}} дополнительная политика",
       "n-more-policies_few": "{{count}} дополнительные политики",
@@ -2169,6 +2205,7 @@
     "query-and-expressions-step": {
       "add-query": "Добавить запрос",
       "body-queries-expressions-configured": "Создайте хотя бы один запрос или выражение, на основе которых будет отправляться оповещение",
+      "confirmText-deactivate": "",
       "expressions": "Выражения",
       "loading-data-sources": "Загрузка источников данных...",
       "manipulate-returned-queries-other-operations": "Управляйте данными, возвращаемыми в результате запросов, с помощью математических и других операций.",
@@ -2236,6 +2273,7 @@
     "redirect-to-clone-rule": {
       "body-evaluation-group": "Нужно будет установить новую группу оценки для скопированного правила, поскольку исходная группа была подготовлена и не может использоваться для правил, созданных в пользовательском интерфейсе.",
       "body-not-provisioned": "Новое правило <1>не</1> будет помечено как подготовленное.",
+      "confirmText-copy": "",
       "title-copy-provisioned-alert-rule": "Копирование подготовленного правила оповещения"
     },
     "redirect-to-rule-viewer": {
@@ -2435,8 +2473,6 @@
       "title-inspect-alert-rule": "Проверка правила оповещения"
     },
     "rule-list": {
-      "cannot-find-rule-details-for": "Не удалось найти сведения о правиле для UID {{uid}}",
-      "cannot-load-rule-details-for": "Не удалось загрузить сведения о правиле для UID {{uid}}",
       "configure-datasource": "Настроить",
       "draft-new-rule": "Составить новое правило",
       "ds-error": {
@@ -2792,6 +2828,9 @@
       "existing-templates-selector-placeholder-choose-notification-template": "Выбрать шаблон уведомления",
       "loading": "Загрузка…",
       "template-options": {
+        "ariaLabel": {
+          "select-notification-template": ""
+        },
         "label": {
           "select-notification-template": "Выбрать шаблон уведомления"
         }
@@ -2818,6 +2857,8 @@
     },
     "templates-table": {
       "actions": "Действия",
+      "body-delete-template-group": "",
+      "confirmText-yes-delete": "",
       "no-templates-defined": "Шаблоны не настроены.",
       "template-group": "Группа шаблонов",
       "title-delete-template-group": "Удаление группы шаблонов"
@@ -2945,6 +2986,11 @@
         "title-delete-contact-point": "Удаление точки контакта"
       }
     },
+    "use-delete-modal": {
+      "modal": {
+        "confirmText-yes-delete": ""
+      }
+    },
     "use-delete-policy-modal": {
       "modal-element": {
         "title-delete-notification-policy": "Удаление политики уведомления"
@@ -3101,7 +3147,8 @@
     "annotation-field-mapper": {
       "annotation": "Аннотация",
       "first-value": "Первое значение",
-      "from": ""
+      "from": "",
+      "noOptionsMessage-unknown-field-names": ""
     },
     "empty-state": {
       "button-title": "Добавить запрос аннотации",
@@ -3235,7 +3282,7 @@
       "team-ids-github": "Целочисленный список идентификаторов команд.",
       "team-ids-label": "Идентификаторы команд",
       "team-ids-numbers": "Идентификаторы команд должны быть числами.",
-      "team-ids-other": "Строковый список идентификаторов команд.",
+      "team-ids-other": "",
       "team-ids-placeholder": "Введите идентификаторы команд и нажмите «Enter», чтобы их добавить",
       "teams-url-description": "URL-адрес, используемый для запроса идентификаторов команд. Если URL-адрес не установлен, значением по умолчанию является /teams.",
       "teams-url-description-oauth": "Если вы устанавливаете «{{ teamsURLLabel }}», также необходимо установить «{{ teamIDsAttributePathLabel }}».",
@@ -3279,6 +3326,7 @@
       "additional-actions-menu": {
         "label-reset-to-default-values": "Сброс до значений по умолчанию"
       },
+      "confirmText-reset": "",
       "disable": "Отключить",
       "disabling": "Отключение...",
       "discard": "Отменить",
@@ -4216,8 +4264,8 @@
     }
   },
   "dashbaord-scene": {
-    "interval-variable-form": {
-      "description-auto-option": "Динамически рассчитывает интервал путем деления временного диапазона на указанное количество."
+    "variable-editor-form": {
+      "run-query": ""
     }
   },
   "dashboard": {
@@ -4379,6 +4427,9 @@
     },
     "dash-nav": {
       "on-open-snapshot-original": {
+        "confirmText": {
+          "proceed": ""
+        },
         "title": {
           "proceed-to-external-site": "Перейти на внешний сайт?"
         }
@@ -4593,6 +4644,13 @@
           "editable": "Редактируемый",
           "readonly": "Только для чтения"
         }
+      },
+      "graph_tooltip_options": {
+        "label": {
+          "default": "",
+          "shared-crosshair": "",
+          "shared-tooltip": ""
+        }
       }
     },
     "get-debug-dashboard": {
@@ -4899,6 +4957,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "Действительно восстановить дашборд до версии {{version}}? Все несохраненные изменения будут потеряны.",
+      "confirmText-restore-version": "",
       "title-restore-version": "Восстановление версии"
     },
     "row-options-button": {
@@ -4949,6 +5008,9 @@
         "title-not-unique": "Заголовок не является уникальным"
       }
     },
+    "save-dashboard": {
+      "message-dashboard-saved": ""
+    },
     "save-dashboard-as-button": {
       "save-as": "Сохранить как"
     },
@@ -4983,6 +5045,7 @@
     "save-dashboard-error-proxy": {
       "body-name-exists": "Дашборд с таким именем уже существует в выбранной папке.<1></1><2>Все равно сохранить дашборд?</2>",
       "body-version-mismatch": "Дашборд обновлен другим пользователем<1></1><2>Все равно сохранить дашборд?</2>",
+      "confirmText-save-and-overwrite": "",
       "title-name-exists": "Конфликт",
       "title-version-mismatch": "Конфликт"
     },
@@ -5179,7 +5242,9 @@
       "label-apply-transformation-to": "Применить преобразование к"
     },
     "transformation-operation-row": {
+      "body-delete": "",
       "render-actions": {
+        "confirmText-delete": "",
         "title-debug": "Отладка",
         "title-disable-transformation": "Отключение преобразования",
         "title-filter": "Фильтр",
@@ -5201,10 +5266,14 @@
       "show-images": "Показать изображения",
       "title-add-another-transformation": "Добавление другого преобразования"
     },
+    "un-theme-transformations-editor": {
+      "body-delete-all-transformations": ""
+    },
     "un-themed-transformations-editor": {
       "actions": {
         "add-another-transformation": "Добавить другое преобразование"
       },
+      "confirmText-delete-all": "",
       "delete-all-transformations": "Удалить все преобразования",
       "title-delete-all-transformations": "Удалить все преобразования?",
       "tooltip-clear-search": "Очистить поиск",
@@ -5241,6 +5310,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "Переключить выбор версии {{version}}",
       "date": "Дата",
+      "name-latest": "",
       "notes": "Примечания",
       "restore": "Восстановить",
       "updated-by": "Кем обновлено",
@@ -5317,7 +5387,8 @@
       "description-enables-users-custom-values": "Позволяет пользователям добавлять пользовательские значения в список.",
       "description-provide-dimensions-as-csv-dimension-name-dimension-id": "Укажите измерения в формате CSV: {{name}}, {{value}}.",
       "label-data-source": "Источник данных",
-      "label-use-static-key-dimensions": "Использовать измерения статического ключа"
+      "label-use-static-key-dimensions": "Использовать измерения статического ключа",
+      "name-allow-custom-values": ""
     },
     "add-to-dashboard": {
       "message": {
@@ -5390,6 +5461,9 @@
       }
     },
     "config-public-dashboard": {
+      "confirmText": {
+        "revoke-public-url": ""
+      },
       "title": {
         "revoke-public-url": "Отозвать общедоступный URL-адрес"
       }
@@ -5401,6 +5475,7 @@
     },
     "custom-variable-form": {
       "custom-options": "Пользовательские параметры",
+      "name-values-separated-comma": "",
       "selection-options": "Параметры выбора"
     },
     "dashboard-edit-pane-renderer": {
@@ -5419,6 +5494,12 @@
       "label-type": "Тип",
       "label-url": "URL",
       "label-with-tags": "С тегами",
+      "link-type-options": {
+        "label": {
+          "dashboards": "",
+          "link": ""
+        }
+      },
       "placeholder-open-dashboard": "Открыть дашборд"
     },
     "dashboard-link-list": {
@@ -5465,6 +5546,8 @@
       "data-source-options": "Параметры источника данных",
       "description-instance-name-filter": "Фильтр регулярных выражений для выбора экземпляров источников данных в списке значений переменных. Оставьте пустым для всех.",
       "example-instance-name-filter": "Пример: <codeExample />",
+      "name-instance-name-filter": "",
+      "name-type": "",
       "selection-options": "Параметры выбора"
     },
     "default-grid-layout-manager": {
@@ -5510,6 +5593,21 @@
     "empty-transformations-message": {
       "add-transformation": "Добавить преобразование"
     },
+    "general-settings-edit-view": {
+      "editable_options": {
+        "label": {
+          "editable": "",
+          "readonly": ""
+        }
+      },
+      "graph_tooltip_options": {
+        "label": {
+          "default": "",
+          "shared-crosshair": "",
+          "shared-tooltip": ""
+        }
+      }
+    },
     "get-edit-options": {
       "title": {
         "column-options": "Параметры столбцов",
@@ -5540,7 +5638,8 @@
       "description-provide-dimensions-as-csv-dimension-name-dimension-id": "Укажите измерения в формате CSV: {{name}}, {{value}}.",
       "group-by-options": "Группировать по параметрам",
       "label-data-source": "Источник данных",
-      "label-use-static-group-by-dimensions": "Использовать измерения статической группы"
+      "label-use-static-group-by-dimensions": "Использовать измерения статической группы",
+      "name-allow-custom-values": ""
     },
     "help-wizard": {
       "copy-to-clipboard": "Копировать в буфер обмена",
@@ -5576,9 +5675,14 @@
       "apply": "Применить"
     },
     "interval-variable-form": {
+      "description-auto-option": "",
       "description-calculated-value-below-threshold": "Расчетное значение не будет ниже этого порога.",
       "description-step-count": "Сколько раз нужно разделить текущий временной диапазон для расчета значения.",
-      "interval-options": "Параметры интервалов"
+      "interval-options": "Параметры интервалов",
+      "name-auto-option": "",
+      "name-min-interval": "",
+      "name-step-count": "",
+      "name-values": ""
     },
     "json-model-edit-view": {
       "cancel-button": {
@@ -5605,6 +5709,9 @@
       "title-name-already-exists": "Название уже существует"
     },
     "on-open-snapshot-original-dashboard": {
+      "confirmText": {
+        "proceed": ""
+      },
       "title": {
         "proceed-to-external-site": "Перейти на внешний сайт?"
       }
@@ -5640,6 +5747,8 @@
     },
     "panel-data-transformations-tab-rendered": {
       "add-another-transformation": "Добавить другое преобразование",
+      "body-delete-all-transformations": "",
+      "confirmText-delete-all": "",
       "delete-all-transformations": "Удалить все преобразования",
       "title-delete-all-transformations": "Удалить все преобразования?"
     },
@@ -5693,6 +5802,7 @@
       "description-optional": "Дополнительно, если вы хотите извлечь часть имени ряда или сегмента узла метрики.",
       "label-data-source": "Источник данных",
       "label-target-data-source": "Целевой источник данных",
+      "name-regex": "",
       "query-options": "Параметры запросов",
       "selection-options": "Параметры выбора"
     },
@@ -5707,6 +5817,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "Действительно восстановить дашборд до версии {{version}}? Все несохраненные изменения будут потеряны.",
+      "confirmText-restore-version": "",
       "title-restore-version": "Восстановление версии"
     },
     "save-button": {
@@ -5802,7 +5913,11 @@
     "selection-options-form": {
       "description-enables-multiple-values-selected": "Позволяет выбирать несколько значений одновременно.",
       "description-enables-option-include-variables": "Включает параметр для добавления всех значений",
-      "description-enables-users-custom-values": "Позволяет пользователям добавлять пользовательские значения в список."
+      "description-enables-users-custom-values": "Позволяет пользователям добавлять пользовательские значения в список.",
+      "name-allow-custom-values": "",
+      "name-custom-all-value": "",
+      "name-include-all-option": "",
+      "name-multi-value": ""
     },
     "share-button": {
       "aria-label-sharedropdownmenu": "Переключить меню общего доступа"
@@ -5822,6 +5937,9 @@
         "copy-to-clipboard-failed": "Не удалось скопировать в буфер обмена"
       }
     },
+    "text-box-variable": {
+      "name-default-value": ""
+    },
     "text-box-variable-form": {
       "placeholder-default-value-if-any": "(необязательно)",
       "text-options": "Параметры текста"
@@ -5845,6 +5963,8 @@
       }
     },
     "unlink-modal": {
+      "body-unlink-panel": "",
+      "confirmText-yes-unlink": "",
       "title-really-unlink-panel": "Действительно отсоединить панель?"
     },
     "unsaved-changes-modal": {
@@ -5861,6 +5981,9 @@
         }
       }
     },
+    "use-save-dashboard": {
+      "message-dashboard-saved": ""
+    },
     "variable-check-indicator": {
       "aria-label-variable-referenced-dashboard": "На эту переменную не ссылается ни одна переменная или дашборд",
       "aria-label-variable-referenced-other-variables-dashboard": "На эту переменную ссылаются другие переменные или дашборд",
@@ -5870,10 +5993,16 @@
     "variable-editor-form": {
       "aria-label-variable-editor-form": "Форма редактора переменных",
       "back-to-list": "Назад к списку",
+      "confirmText": {
+        "delete-variable": ""
+      },
       "delete": "Удалить",
       "description-optional-display-name": "Отображаемое имя (необязательно)",
       "description-template-variable-characters": "Название переменной шаблона. (Макс. 50 символов.)",
       "general": "Общие сведения",
+      "name-description": "",
+      "name-label": "",
+      "name-name": "",
       "placeholder-descriptive-text": "Поясняющий текст",
       "placeholder-label-name": "Название метки",
       "placeholder-variable-name": "Название переменной",
@@ -5888,13 +6017,25 @@
       "variable": "Переменная"
     },
     "variable-editor-list-row": {
+      "body-delete-variable": "",
+      "confirmText-delete-variable": "",
       "title-delete-variable": "Удаление переменной",
       "tooltip-duplicate-variable": "Дублировать переменную",
       "tooltip-remove-variable": "Удалить переменную"
     },
     "variable-hide-select": {
+      "hide_options": {
+        "label": {
+          "label": "",
+          "nothing": "",
+          "variable": ""
+        }
+      },
       "label": "Скрыть"
     },
+    "variable-type-select": {
+      "name-variable-type": ""
+    },
     "variable-usages-button": {
       "title-show-usages": "Показаны варианты использования для: {{variableId}}",
       "tooltip-show-usages": "Показать варианты использования"
@@ -5921,6 +6062,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "Переключить выбор версии {{version}}",
       "date": "Дата",
+      "name-latest": "",
       "notes": "Примечания",
       "restore": "Восстановить",
       "updated-by": "Кем обновлено",
@@ -6308,7 +6450,8 @@
       }
     },
     "color-dimension-editor": {
-      "label-fixed-color": ""
+      "label-fixed-color": "",
+      "noOptionsMessage-no-fields-found": ""
     },
     "file-dropzone-custom-children": {
       "upload": "Передать"
@@ -6346,6 +6489,7 @@
       },
       "label-limit": "Предельное значение",
       "label-value": "Значение",
+      "noOptionsMessage-no-fields-found": "",
       "scalar-options": {
         "description-clamped": "",
         "description-mod": "",
@@ -6354,9 +6498,15 @@
       }
     },
     "scale-dimension-editor": {
+      "fixed-value-option": {
+        "label": {
+          "fixed-value": ""
+        }
+      },
       "label-max": "Макс.",
       "label-min": "Мин.",
-      "label-value": "Значение"
+      "label-value": "Значение",
+      "noOptionsMessage-no-fields-found": ""
     },
     "text-dimension-editor": {
       "description-field": "",
@@ -6928,6 +7078,8 @@
       "aria-label-select-service-name-operator": "Выбрать оператор названия службы",
       "aria-label-select-span-name": "Выбрать название диапазона",
       "aria-label-select-span-name-operator": "Выбрать оператора названия диапазона",
+      "ariaLabel-select-max-span-duration": "",
+      "ariaLabel-select-min-span-duration": "",
       "label-collapse": "Фильтры диапазонов",
       "label-duration": "Длительность",
       "label-service-name": "Название службы",
@@ -6998,6 +7150,8 @@
       "split-widen": "Расширить область"
     },
     "trace-page-actions": {
+      "ariaLabel-copy-trace-id": "",
+      "ariaLabel-export-trace": "",
       "give-feedback": "Отправить отзыв",
       "label-copied": "Скопировано",
       "label-export": "Экспорт",
@@ -7135,6 +7289,7 @@
   },
   "folder-filter": {
     "clear-folder-button": "Очистить папки",
+    "noOptionsMessage-no-folders-found": "",
     "select-aria-label": "Фильтр папок",
     "select-placeholder": "Фильтровать по папкам"
   },
@@ -7203,7 +7358,53 @@
     "incomplete-request-error": "К сожалению, не удалось выполнить запрос. Повторите попытку.",
     "send-custom-feedback": "Отправить"
   },
+  "geo": {
+    "get-geometry-field": {
+      "warning-gazetteer-not-found": "",
+      "warning-no-geometry": "",
+      "warning-select-geohash": "",
+      "warning-select-lat-long": "",
+      "warning-select-lookup": "",
+      "warning-unable-to-find": ""
+    },
+    "location-editor": {
+      "geohash-field": {
+        "no-fields-message": ""
+      },
+      "latitude-field": {
+        "no-fields-message": ""
+      },
+      "longitude-field": {
+        "no-fields-message": ""
+      },
+      "lookup-field": {
+        "no-fields-message": ""
+      },
+      "name-gazetteer": "",
+      "name-geohash-field": "",
+      "name-latitude-field": "",
+      "name-location-mode": "",
+      "name-longitude-field": "",
+      "name-lookup-field": ""
+    },
+    "location-more-editor": {
+      "mode-options": {
+        "description-auto": "",
+        "description-coords": "",
+        "description-geohash": "",
+        "description-lookup": "",
+        "label-auto": "",
+        "label-coords": "",
+        "label-geohash": "",
+        "label-lookup": ""
+      }
+    }
+  },
   "geomap": {
+    "category-basemap-layer": "",
+    "category-map-controls": "",
+    "category-map-layers": "",
+    "category-map-view": "",
     "coordinates-map-view-editor": {
       "label-latitude": "Широта",
       "label-longitude": "Долгота"
@@ -7212,6 +7413,14 @@
       "center": "Центр:",
       "zoom": "Масштаб:"
     },
+    "description-initial-view": "",
+    "description-mouse-wheel-zoom": "",
+    "description-share-view": "",
+    "description-show-attribution": "",
+    "description-show-debug": "",
+    "description-show-measure": "",
+    "description-show-scale": "",
+    "description-show-zoom": "",
     "fit-map-view-editor": {
       "all-layers-editor-fragment": {
         "label-layer": "Слой"
@@ -7234,6 +7443,14 @@
     "geomap-style-rules-editor": {
       "aria-label-add-geomap-style-rule": "Добавить правило стиля геокарты"
     },
+    "layer-editor": {
+      "category-base-layer": "",
+      "description-display-tooltip": "",
+      "name-data": "",
+      "name-display-tooltip": "",
+      "name-layer-type": "",
+      "name-opacity": ""
+    },
     "layers-editor": {
       "label-add-layer": "Добавить слой",
       "no-layers": "Без слоев?"
@@ -7244,16 +7461,38 @@
       "label-zoom": "Масштаб",
       "use-current-map-settings": "Использовать текущие настройки карты"
     },
+    "markers-layer": {
+      "description-show-legend": "",
+      "name-show-legend": "",
+      "name-styles": ""
+    },
     "markers-legend": {
       "title-symbol": "Символ"
     },
     "measure-overlay": {
       "tooltip-show-measure-tools": "Показать инструменты измерения"
     },
+    "name-initial-view": "",
+    "name-mouse-wheel-zoom": "",
+    "name-share-view": "",
+    "name-show-attribution": "",
+    "name-show-debug": "",
+    "name-show-measure": "",
+    "name-show-scale": "",
+    "name-show-zoom": "",
+    "name-tooltip": "",
+    "photos-layer": {
+      "noFieldsMessage-no-string-fields": ""
+    },
     "plugin": {
       "basemap-layer-configured-server-admin": "Слой базовой карты конфигурируется администратором сервера."
     },
     "style-editor": {
+      "horizontal-align-options": {
+        "label-center": "",
+        "label-left": "",
+        "label-right": ""
+      },
       "label-align": "Выравнивание",
       "label-baseline": "Базовая линия",
       "label-color": "Цвет",
@@ -7267,7 +7506,14 @@
       "label-symbol-vertical-align": "Вертикальное выравнивание символов",
       "label-text-label": "Текстовая метка",
       "label-x-offset": "Смещение по оси X",
-      "label-y-offset": "Смещение по оси Y"
+      "label-y-offset": "Смещение по оси Y",
+      "placeholderText-select-symbol": "",
+      "placeholderText-select-symbol-or-add-text": "",
+      "vertical-align-options": {
+        "label-bottom": "",
+        "label-center": "",
+        "label-top": ""
+      }
     },
     "style-rule-editor": {
       "aria-label-comparison-operator": "Оператор сравнения",
@@ -7278,6 +7524,15 @@
       "placeholder-feature-property": "Свойство функции",
       "placeholder-numeric-value": "Числовое значение",
       "placeholder-value": "значение"
+    },
+    "tooltip-options": {
+      "description-details": "",
+      "description-none": "",
+      "label-details": "",
+      "label-none": ""
+    },
+    "utils": {
+      "get-next-layer-name": ""
     }
   },
   "get-enterprise": {
@@ -7527,7 +7782,8 @@
       "aria-label-selected-color": "{{colorLabel}} цвет"
     },
     "confirm-button": {
-      "cancel": "Отмена"
+      "cancel": "Отмена",
+      "confirmText-delete": ""
     },
     "confirm-content": {
       "placeholder": "Введите «{{confirmPromptText}}» для подтверждения"
@@ -7709,6 +7965,8 @@
     },
     "panel-chrome": {
       "aria-label-toggle-collapse": "включить сворачивание панели",
+      "ariaLabel-panel-loading": "",
+      "ariaLabel-panel-status": "",
       "tooltip-cancel": "Отмена запроса",
       "tooltip-cancel-loading": "Отмена запроса",
       "tooltip-stop-streaming": "Остановка потоковой передачи",
@@ -7876,6 +8134,12 @@
       "footer-click-to-action": "Нажмите, чтобы {{actionTitle}}",
       "footer-click-to-navigate": "Нажмите, чтобы открыть {{linkTitle}}",
       "timestamp": "Метка времени"
+    },
+    "week-start-picker": {
+      "weekStarts-label-default": "",
+      "weekStarts-label-monday": "",
+      "weekStarts-label-saturday": "",
+      "weekStarts-label-sunday": ""
     }
   },
   "graph": {
@@ -8258,6 +8522,10 @@
     "add-library-panel-modal": {
       "title-create-library-panel": "Создание панели библиотеки"
     },
+    "change-library-panel-modal": {
+      "confirmText-change": "",
+      "confirmText-replace": ""
+    },
     "confirm": {
       "delete-panel": "Удалить панель?"
     },
@@ -8708,6 +8976,8 @@
       "updated-on": "Дата обновления"
     },
     "snapshot-list-table": {
+      "body-delete": "",
+      "confirmText-delete": "",
       "title-delete": "Удалить"
     },
     "unthemed-dashboard-import": {
@@ -8719,6 +8989,9 @@
       }
     }
   },
+  "metric-select": {
+    "noOptionsMessage-no-options-found": ""
+  },
   "migrate-to-cloud": {
     "build-snapshot": {
       "description": "Инструмент может перенести некоторые ресурсы из этого экземпляра в облачный стек. Чтобы начать, вам нужно создать снимок этого экземпляра. Создание снимка обычно занимает менее двух минут. Снимок хранится вместе с этим экземпляром Grafana.",
@@ -9417,10 +9690,10 @@
     "marker": {
       "100-node-count": ">100 узлов",
       "aria-label-hidden-marker": "Маркер скрытых узлов: {{marker}}",
-      "node-count_one": "{{count}} узел",
+      "node-count_one": "{{count}} узлов",
       "node-count_few": "{{count}} узла",
       "node-count_many": "{{count}} узлов",
-      "node-count_other": "{{count}} узла"
+      "node-count_other": "{{count}} узлов"
     },
     "node": {
       "aria-label-node-title": "Узел: {{nodeName}}"
@@ -9430,13 +9703,13 @@
       "aria-label-nodes-hidden-warning": "Предупреждение о скрытых узлах",
       "computing-layout": "Макет вычислений",
       "no-data": "Нет данных",
-      "hidden-nodes_one": "<0></0> {{count}} узел скрыт из соображений производительности.",
+      "hidden-nodes_one": "<0></0> {{count}} узлов скрыты из соображений производительности.",
       "hidden-nodes_few": "<0></0> {{count}} узла скрыты из соображений производительности.",
       "hidden-nodes_many": "<0></0> {{count}} узлов скрыты из соображений производительности.",
-      "hidden-nodes_other": "<0></0> {{count}} узла скрыты из соображений производительности.",
-      "processed-nodes_one": "<0></0> Многоуровневый макет может работать медленно с {{count}} узлом.",
+      "hidden-nodes_other": "<0></0> {{count}} узлов скрыты из соображений производительности.",
+      "processed-nodes_one": "<0></0> Многоуровневый макет может работать медленно с {{count}} узла.",
       "processed-nodes_few": "<0></0> Многоуровневый макет может работать медленно с {{count}} узлами.",
-      "processed-nodes_many": "<0></0> Многоуровневый макет может работать медленно с {{count}} узлами.",
+      "processed-nodes_many": "<0></0> Многоуровневый макет может работать медленно с {{count}} узла.",
       "processed-nodes_other": "<0></0> Многоуровневый макет может работать медленно с {{count}} узла."
     },
     "node-graph-panel": {
@@ -9563,6 +9836,7 @@
     }
   },
   "org-picker": {
+    "noOptionsMessage-no-organizations-found": "",
     "select-placeholder": "Выбрать организацию"
   },
   "page": {
@@ -9785,6 +10059,7 @@
         "permission": "Отсутствует разрешение на просмотр этой страницы.",
         "title-access-denied": "Доступ запрещен"
       },
+      "error-loading-plugin": "",
       "no-root-app-page-component-found": "Компонент корневой страницы приложения не найден"
     },
     "browse": {
@@ -9828,8 +10103,7 @@
         "update-status-text": "плагины обновлены"
       },
       "versions": {
-        "confirmation-text-1": "Действительно вернуться к версии",
-        "confirmation-text-2": "Обычно такой шаг не рекомендуется",
+        "confirmation-text": "",
         "downgrade-confirm": "Понизить версию",
         "downgrade-title": "Понижение версии плагина"
       }
@@ -9883,6 +10157,10 @@
     "empty-state": {
       "message": "Плагины не найдены"
     },
+    "extensions": {
+      "extension-error-alert-description": "",
+      "extension-error-alert-title": ""
+    },
     "extensions-log-data-source": {
       "message": {
         "ok": "OK"
@@ -9916,7 +10194,11 @@
       "updating": "Обновление"
     },
     "install-controls-button": {
-      "title-uninstall-modal": "Удаление {{plugin}}"
+      "title-uninstall-modal": "Удаление {{plugin}}",
+      "uninstall-controls": {
+        "body-uninstall-plugin": "",
+        "confirmText-confirm": ""
+      }
     },
     "install-controls-warning": {
       "body-not-published": "Этот плагин не опубликован на странице <2>grafana.com/plugins</2> и им невозможно управлять через каталог.",
@@ -10962,6 +11244,7 @@
     }
   },
   "service-account-picker": {
+    "noOptionsMessage-no-service-accounts-found": "",
     "select-aria-label": "Указатель служебной учетной записи",
     "select-placeholder": "Начните вводить текст для поиска служебных учетных записей"
   },
@@ -11007,6 +11290,10 @@
     },
     "service-account-page-unconnected": {
       "add-service-account-token": "Добавить токен служебной учетной записи",
+      "body-delete-service-account": "",
+      "body-disable-service-account": "",
+      "confirmText-delete-service-account": "",
+      "confirmText-disable-service-account": "",
       "delete-service-account": "Удалить служебную учетную запись",
       "disable-service-account": "Отключить служебную учетную запись",
       "enable-service-account": "Включить служебную учетную запись",
@@ -11033,6 +11320,7 @@
       "used-by": "Кем используется"
     },
     "service-account-profile-row": {
+      "confirmText-save": "",
       "edit": "Редактировать"
     },
     "service-account-role-row": {
@@ -11046,10 +11334,18 @@
     },
     "service-accounts-list-page-unconnected": {
       "add-service-account": "Добавить служебную учетную запись",
+      "body-delete-with-tokens": "",
+      "body-disable-service-account": "",
+      "confirmText-delete": "",
+      "confirmText-disable-service-account": "",
       "placeholder-search-service-account-by-name": "Поиск служебной учетной записи по имени",
       "sub-title": "Служебные учетные записи и их токены можно использовать для аутентификации в API Grafana Подробнее см. в нашей <2>документации</2></2>",
       "title-delete-service-account": "Удалить служебную учетную запись",
-      "title-disable-service-account": "Отключение служебной учетной записи"
+      "title-disable-service-account": "Отключение служебной учетной записи",
+      "body-delete_one": "",
+      "body-delete_few": "",
+      "body-delete_many": "",
+      "body-delete_other": ""
     },
     "token-expiration": {
       "content-this-token-has-expired": "Срок действия токена истек",
@@ -11441,7 +11737,7 @@
       "label-never": ""
     },
     "status-history-panel": {
-      "too-many-points_one": "Слишком много точек для правильной визуализации. <1></1>Обновите запрос, чтобы получить меньше точек. <3></3>(получена {{count}} точка)",
+      "too-many-points_one": "Слишком много точек для правильной визуализации. <1></1>Обновите запрос, чтобы получить меньше точек. <3></3>(получено {{count}} точки)",
       "too-many-points_few": "Слишком много точек для правильной визуализации. <1></1>Обновите запрос, чтобы получить меньше точек. <3></3>(получены {{count}} точки)",
       "too-many-points_many": "Слишком много точек для правильной визуализации. <1></1>Обновите запрос, чтобы получить меньше точек. <3></3>(получены {{count}} точек)",
       "too-many-points_other": "Слишком много точек для правильной визуализации. <1></1>Обновите запрос, чтобы получить меньше точек. <3></3>(получено {{count}} точки)"
@@ -11588,6 +11884,7 @@
     "tag-option-label": "Параметр тегов"
   },
   "team-picker": {
+    "noOptionsMessage-no-teams-found": "",
     "select-aria-label": "Указатель команды",
     "select-placeholder": "Выбрать команду"
   },
@@ -11913,6 +12210,7 @@
     "convert-field-type-transformer-editor": {
       "aria-label-add-a-convert-field-type-transformer": "Добавить преобразователь типа поля",
       "aria-label-remove-convert-field-type-transformer": "Удалить преобразователь типа поля",
+      "convert-field-type": "",
       "label": {
         "browser": "Браузер",
         "utc": "UTC"
@@ -11955,6 +12253,11 @@
       "remove-enum-row-tooltip-delete": "Удалить"
     },
     "extract-fields-transformer-editor": {
+      "field-name-picker-settings": {
+        "placeholderText": {
+          "select-field": ""
+        }
+      },
       "label-delimiter": "Разделитель",
       "label-format": "Формат",
       "label-keep-time": "Сохранить время",
@@ -11968,6 +12271,14 @@
       "aria-label-threshold-color": "Пороговый цвет"
     },
     "field-lookup-transformer-editor": {
+      "field-name-picker-settings": {
+        "noFieldsMessage": {
+          "no-text-fields-found": ""
+        },
+        "placeholderText": {
+          "select-text-field": ""
+        }
+      },
       "label-field": "Поле",
       "label-lookup": "Просмотр"
     },
@@ -11993,10 +12304,30 @@
     },
     "filter-by-value-transformer-editor": {
       "add-condition": "Добавить условие",
+      "filter-match": {
+        "label": {
+          "match-all": "",
+          "match-any": ""
+        }
+      },
+      "filter-types": {
+        "label": {
+          "exclude": "",
+          "include": ""
+        }
+      },
       "label-conditions": "Условия",
       "label-filter-type": "Тип фильтра"
     },
     "format-string-transfomer-editor": {
+      "field-name-picker-settings": {
+        "noFieldsMessage": {
+          "no-text-fields-found": ""
+        },
+        "placeholderText": {
+          "select-text-field": ""
+        }
+      },
       "label-field": "Поле",
       "label-format": "Формат",
       "label-substring-range": "Диапазон подстрок"
@@ -12307,6 +12638,7 @@
     "title": "Организации"
   },
   "user-picker": {
+    "noOptionsMessage-no-users-found": "",
     "select-aria-label": "Указатель пользователей",
     "select-placeholder": "Начните вводить текст для поиска пользователя"
   },
@@ -12392,6 +12724,8 @@
       }
     },
     "confirm-delete-modal": {
+      "body-delete-variable": "",
+      "confirmText-delete": "",
       "title-delete-variable": "Удаление переменной"
     },
     "create-ad-hoc-variable-adapter": {
@@ -12440,9 +12774,24 @@
       "label-refresh": "Обновить"
     },
     "query-variable-sort-select": {
-      "description-values-variable": "Как сортировать значения этой переменной."
+      "description-values-variable": "Как сортировать значения этой переменной.",
+      "name-sort": "",
+      "sort_options": {
+        "label": {
+          "alphabetical-asc": "",
+          "alphabetical-caseinsensitive-asc": "",
+          "alphabetical-caseinsensitive-desc": "",
+          "alphabetical-desc": "",
+          "disabled": "",
+          "natural-asc": "",
+          "natural-desc": "",
+          "numerical-asc": "",
+          "numerical-desc": ""
+        }
+      }
     },
     "text-box-variable-editor": {
+      "name-default-value": "",
       "placeholder-default-value-if-any": "значение по умолчанию, если имеется",
       "text-options": "Параметры текста"
     },
@@ -12471,6 +12820,8 @@
       "description-optional-display-name": "Отображаемое имя (необязательно)",
       "description-template-variable-characters": "Название переменной шаблона. (Макс. 50 символов.)",
       "general": "Общие сведения",
+      "name-label": "",
+      "name-name": "",
       "placeholder-descriptive-text": "Поясняющий текст",
       "placeholder-label-name": "Название метки",
       "placeholder-variable-name": "Название переменной",
@@ -12485,9 +12836,15 @@
       "tooltip-duplicate-variable": "Дублировать переменную",
       "tooltip-remove-variable": "Удалить переменную"
     },
+    "variable-editor-un-connected": {
+      "name-description": ""
+    },
     "variable-options": {
       "aria-label-toggle-all-values": "Переключить все значения"
     },
+    "variable-type-select": {
+      "name-select-variable-type": ""
+    },
     "variable-usages-button": {
       "tooltip-show-usages": "Показать варианты использования"
     },
diff --git a/public/locales/sv-SE/grafana.json b/public/locales/sv-SE/grafana.json
index 8bf23d8b471..4f7bb6d9dec 100644
--- a/public/locales/sv-SE/grafana.json
+++ b/public/locales/sv-SE/grafana.json
@@ -84,6 +84,7 @@
     "admin-feature-toggles-table": {
       "confirm-modal-body-1": "Vissa funktioner är stabila (GA) och aktiverade som standard, medan vissa för närvarande är i sin preliminära betafas och finns tillgängliga för tidig tillämpning.",
       "confirm-modal-body-2": "Vi rekommenderar att du ser till att du förstår konsekvenserna av varje funktionsändring innan du gör några ändringar.",
+      "confirmText-save-changes": "",
       "get-stage-cell": {
         "beta": "Beta",
         "content-general-availability": "Allmän tillgänglighet",
@@ -96,14 +97,21 @@
     },
     "admin-orgs-table": {
       "aria-label-delete-org": "Radera org",
+      "confirmText-delete": "",
       "title-delete": "Radera"
     },
     "anon-users": {
       "not-found": "Inga anonyma användare hittades."
     },
     "base-user-sessions": {
+      "body-force-logout-from-all-devices": "",
+      "confirmText-confirm-logout": "",
+      "confirmText-force-logout": "",
       "title-force-logout-from-all-devices": "Tvinga utloggning från alla enheter"
     },
+    "change-org-button": {
+      "confirmText-save": ""
+    },
     "edit-org": {
       "access-denied": "Du har inte behörighet att se användare i denna organisation. Kontakta serveradministratören om du behöver uppdatera den här organisationen.",
       "heading": "Redigera organisation",
@@ -208,9 +216,11 @@
       "not-editable": "Denna användares roll kan inte redigeras eftersom den synkroniseras från din autentiseringsleverantör. Se <1>Grafanas autentiseringsdokumentation</1> för mer information."
     },
     "org-users-table": {
+      "body-delete": "",
       "columns": {
         "aria-label-role": "Roll"
       },
+      "confirmText-delete": "",
       "delete-aria-label": "Radera användare: {{name}}",
       "title-delete": "Radera"
     },
@@ -241,6 +251,9 @@
     "settings": {
       "info-description": "Dessa systeminställningar definieras i grafana.ini eller custom.ini (eller åsidosätts genom ENV-variabler). För att ändra dessa måste du för närvarande starta om Grafana."
     },
+    "un-themed-org-row": {
+      "confirmText-confirm-removal": ""
+    },
     "upgrade-info": {
       "title": "Företagslicens"
     },
@@ -293,12 +306,17 @@
     },
     "user-permissions": {
       "change-button": "Ändra",
+      "confirmText-change": "",
       "grafana-admin-key": "Grafana Admin",
       "grafana-admin-no": "Nej",
       "grafana-admin-yes": "Ja",
       "title": "Behörigheter"
     },
     "user-profile": {
+      "body-delete": "",
+      "body-disable": "",
+      "confirmText-delete-user": "",
+      "confirmText-disable-user": "",
       "delete-button": "Radera användare",
       "disable-button": "Inaktivera användare",
       "edit-button": "Redigera",
@@ -312,6 +330,9 @@
       "title-delete-user": "Radera användare",
       "title-disable-user": "Inaktivera användare"
     },
+    "user-profile-row": {
+      "confirmText-save": ""
+    },
     "user-sessions": {
       "browser-column": "Webbläsare och operativsystem",
       "force-logout-all-button": "Tvinga utloggning från alla enheter",
@@ -461,6 +482,9 @@
       "label-muting-grouping-and-timings-optional": "Tystnad, gruppering och tidsinställningar (valfritt)",
       "title-muting-grouping-and-timings": "Tystnad, gruppering och tidsinställningar"
     },
+    "alert-manager-picker": {
+      "noOptionsMessage-no-datasources-found": ""
+    },
     "alert-menu": {
       "copy-link": "Kopiera länk",
       "duplicate": "Dubblett",
@@ -550,6 +574,7 @@
       "view-configuration": "Visa konfiguration"
     },
     "alertmanager-config": {
+      "confirmText-yes-reset-configuration": "",
       "gma-manual-configuration-description": "Den interna konfigurationen för Grafana Alertmanager kan inte ändras manuellt. Ändra den här konfigurationen genom att redigera de enskilda resurserna via användargränssnittet.",
       "gma-manual-configuration-is-not-supported": "Manuella konfigurationsändringar stöds inte",
       "message": {
@@ -564,11 +589,13 @@
       "title-resetting-alertmanager-configuration": "Återställer konfigurationen för Alertmanager"
     },
     "alertmanager-configuration-version-manager": {
+      "body-restore-configuration-version-unsaved-changes": "",
       "columns": {
         "compare": "Jämför",
         "restore": "Återställ",
         "text-latest": "Senaste"
       },
+      "confirmText-yes-restore-configuration": "",
       "loading": "Laddar …",
       "no-previous-configurations": "Inga tidigare konfigurationer",
       "this-might-take-a-while": "Det kan ta en stund …",
@@ -848,8 +875,10 @@
     },
     "contact-point-header": {
       "aria-label-more-actions": "Fler åtgärder för kontaktpunkten ”{{contactPointName}}”",
+      "ariaLabel-delete": "",
       "button-edit": "Redigera",
       "button-view": "Visa",
+      "export-ariaLabel-export": "",
       "export-label-export": "Exportera",
       "label-delete": "Ta bort",
       "label-manage-permissions": "Hantera behörigheter",
@@ -1384,6 +1413,7 @@
       "label-disable-resolved-message": "Inaktivera löst meddelande"
     },
     "grafana-evaluation-behavior-step": {
+      "loadingMessage-loading-groups": "",
       "message": {
         "must-be-a-positive-integer": "Måste vara ett positivt heltal.",
         "must-enter-a-group-name": "Måste ange ett gruppnamn"
@@ -1842,7 +1872,11 @@
             "other-data-sources": "Andra datakällor"
           }
         }
-      }
+      },
+      "noOptionsMessage-no-datasources-found": ""
+    },
+    "mute-timing-actions-button": {
+      "body-delete-mute-timing": ""
     },
     "mute-timing-actions-buttons": {
       "text-disabled": "Inaktiverad",
@@ -2093,9 +2127,11 @@
       "update-errors": {
         "conflict": "Aviseringspolicyträdet har uppdaterats av en annan användare.",
         "error-code": "Felmeddelande: ”{{error}}”",
-        "fallback": "Något gick fel när du uppdaterade dina aviseringspolicyer.",
+        "routes": {
+          "conflictingMatchers": ""
+        },
         "suffix": "Uppdatera sidan och försök igen.",
-        "title": "Fel när aviseringspolicy skulle sparas"
+        "title": ""
       },
       "n-more-policies_one": "{{count}} ytterligare policyer",
       "n-more-policies_other": "{{count}} ytterligare policyer"
@@ -2151,6 +2187,7 @@
     "query-and-expressions-step": {
       "add-query": "Lägg till fråga",
       "body-queries-expressions-configured": "Skapa minst en fråga eller ett uttryck att bli larmad för",
+      "confirmText-deactivate": "",
       "expressions": "Uttryck",
       "loading-data-sources": "Laddar datakällor …",
       "manipulate-returned-queries-other-operations": "Manipulera data som returneras från frågor med matematikfunktioner och andra operationer.",
@@ -2218,6 +2255,7 @@
     "redirect-to-clone-rule": {
       "body-evaluation-group": "Du måste ställa in en ny utvärderingsgrupp för den kopierade regeln eftersom den ursprungliga har provisionerats och inte kan användas för regler som skapats i användargränssnittet.",
       "body-not-provisioned": "Den nya regeln kommer <1>inte</1> att markeras som en provisionerad regel.",
+      "confirmText-copy": "",
       "title-copy-provisioned-alert-rule": "Kopiera provisionerad larmregel"
     },
     "redirect-to-rule-viewer": {
@@ -2415,8 +2453,6 @@
       "title-inspect-alert-rule": "Inspektera larmregel"
     },
     "rule-list": {
-      "cannot-find-rule-details-for": "Kan inte hitta regelinformation för UID {{uid}}",
-      "cannot-load-rule-details-for": "Kunde inte ladda regelinformation för UID {{uid}}",
       "configure-datasource": "Konfigurera",
       "draft-new-rule": "Skapa utkast till en ny regel",
       "ds-error": {
@@ -2766,6 +2802,9 @@
       "existing-templates-selector-placeholder-choose-notification-template": "Välj aviseringsmall",
       "loading": "Laddar …",
       "template-options": {
+        "ariaLabel": {
+          "select-notification-template": ""
+        },
         "label": {
           "select-notification-template": "Välj aviseringsmall"
         }
@@ -2792,6 +2831,8 @@
     },
     "templates-table": {
       "actions": "Åtgärder",
+      "body-delete-template-group": "",
+      "confirmText-yes-delete": "",
       "no-templates-defined": "Inga mallar definierade.",
       "template-group": "Mallgrupp",
       "title-delete-template-group": "Radera mallgrupp"
@@ -2919,6 +2960,11 @@
         "title-delete-contact-point": "Radera kontaktpunkt"
       }
     },
+    "use-delete-modal": {
+      "modal": {
+        "confirmText-yes-delete": ""
+      }
+    },
     "use-delete-policy-modal": {
       "modal-element": {
         "title-delete-notification-policy": "Radera aviseringspolicy"
@@ -3075,7 +3121,8 @@
     "annotation-field-mapper": {
       "annotation": "Kommentar",
       "first-value": "Första värde",
-      "from": ""
+      "from": "",
+      "noOptionsMessage-unknown-field-names": ""
     },
     "empty-state": {
       "button-title": "Lägg till kommenteringsfråga",
@@ -3209,7 +3256,7 @@
       "team-ids-github": "Heltalslista över team-ID:n.",
       "team-ids-label": "Team-ID:n",
       "team-ids-numbers": "Team-ID:n måste vara siffror.",
-      "team-ids-other": "Stränglista över team-ID:n.",
+      "team-ids-other": "",
       "team-ids-placeholder": "Ange team-ID och tryck på returtangenten för att lägga till",
       "teams-url-description": "Webbadressen som används för att fråga efter team-ID:n. Om det inte anges är standardvärdet /teams.",
       "teams-url-description-oauth": "Om du konfigurerar ”{{ teamsURLLabel }}” måste du även konfigurera ”{{ teamIDsAttributePathLabel }}”.",
@@ -3253,6 +3300,7 @@
       "additional-actions-menu": {
         "label-reset-to-default-values": "Återställ till standardvärden"
       },
+      "confirmText-reset": "",
       "disable": "Inaktivera",
       "disabling": "Inaktiverar …",
       "discard": "Kassera",
@@ -4180,8 +4228,8 @@
     }
   },
   "dashbaord-scene": {
-    "interval-variable-form": {
-      "description-auto-option": "Beräknar intervallet dynamiskt genom att dividera tidsintervallet med det angivna antalet"
+    "variable-editor-form": {
+      "run-query": ""
     }
   },
   "dashboard": {
@@ -4343,6 +4391,9 @@
     },
     "dash-nav": {
       "on-open-snapshot-original": {
+        "confirmText": {
+          "proceed": ""
+        },
         "title": {
           "proceed-to-external-site": "Fortsätt till extern webbplats?"
         }
@@ -4557,6 +4608,13 @@
           "editable": "Redigerbar",
           "readonly": "Skrivskyddad"
         }
+      },
+      "graph_tooltip_options": {
+        "label": {
+          "default": "",
+          "shared-crosshair": "",
+          "shared-tooltip": ""
+        }
       }
     },
     "get-debug-dashboard": {
@@ -4861,6 +4919,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "Är du säker på att du vill återställa instrumentpanelen till version {{version}}? Alla ändringar som inte sparats kommer att gå förlorade.",
+      "confirmText-restore-version": "",
       "title-restore-version": "Återställ versionen"
     },
     "row-options-button": {
@@ -4911,6 +4970,9 @@
         "title-not-unique": "Den här titeln är inte unik"
       }
     },
+    "save-dashboard": {
+      "message-dashboard-saved": ""
+    },
     "save-dashboard-as-button": {
       "save-as": "Spara som"
     },
@@ -4945,6 +5007,7 @@
     "save-dashboard-error-proxy": {
       "body-name-exists": "En instrumentpanel med samma namn finns redan i den valda mappen. <1></1><2>Vill du fortfarande spara denna instrumentpanel?</2>",
       "body-version-mismatch": "Någon annan har uppdaterat denna instrumentpanel<1></1><2>Vill du fortfarande spara denna instrumentpanel?</2>",
+      "confirmText-save-and-overwrite": "",
       "title-name-exists": "Konflikt",
       "title-version-mismatch": "Konflikt"
     },
@@ -5141,7 +5204,9 @@
       "label-apply-transformation-to": "Tillämpa transformering på"
     },
     "transformation-operation-row": {
+      "body-delete": "",
       "render-actions": {
+        "confirmText-delete": "",
         "title-debug": "Felsök",
         "title-disable-transformation": "Inaktivera transformering",
         "title-filter": "Filtrera",
@@ -5163,10 +5228,14 @@
       "show-images": "Visa bilder",
       "title-add-another-transformation": "Lägg till ytterligare en transformering"
     },
+    "un-theme-transformations-editor": {
+      "body-delete-all-transformations": ""
+    },
     "un-themed-transformations-editor": {
       "actions": {
         "add-another-transformation": "Lägg till ytterligare en transformering"
       },
+      "confirmText-delete-all": "",
       "delete-all-transformations": "Radera alla transformeringar",
       "title-delete-all-transformations": "Radera alla transformeringar?",
       "tooltip-clear-search": "Rensa sökningen",
@@ -5203,6 +5272,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "Växla val av version {{version}}",
       "date": "Datum",
+      "name-latest": "",
       "notes": "Anteckningar",
       "restore": "Återställ",
       "updated-by": "Uppdaterad av",
@@ -5279,7 +5349,8 @@
       "description-enables-users-custom-values": "Gör det möjligt för användare att lägga till anpassade värden i listan",
       "description-provide-dimensions-as-csv-dimension-name-dimension-id": "Tillhandahåll dimensioner som CSV: {{name}}, {{value}}",
       "label-data-source": "Datakälla",
-      "label-use-static-key-dimensions": "Använd dimensioner för statiska nycklar"
+      "label-use-static-key-dimensions": "Använd dimensioner för statiska nycklar",
+      "name-allow-custom-values": ""
     },
     "add-to-dashboard": {
       "message": {
@@ -5352,6 +5423,9 @@
       }
     },
     "config-public-dashboard": {
+      "confirmText": {
+        "revoke-public-url": ""
+      },
       "title": {
         "revoke-public-url": "Återkalla offentlig webbadress"
       }
@@ -5363,6 +5437,7 @@
     },
     "custom-variable-form": {
       "custom-options": "Anpassade alternativ",
+      "name-values-separated-comma": "",
       "selection-options": "Urvalsalternativ"
     },
     "dashboard-edit-pane-renderer": {
@@ -5381,6 +5456,12 @@
       "label-type": "Typ",
       "label-url": "URL",
       "label-with-tags": "Med taggar",
+      "link-type-options": {
+        "label": {
+          "dashboards": "",
+          "link": ""
+        }
+      },
       "placeholder-open-dashboard": "Öppna instrumentpanel"
     },
     "dashboard-link-list": {
@@ -5427,6 +5508,8 @@
       "data-source-options": "Alternativ för datakälla",
       "description-instance-name-filter": "Regex-filter för vilka datakällsinstanser att välja mellan i variabelvärdelistan. Lämna tomt för alla.",
       "example-instance-name-filter": "Exempel: <codeExample />",
+      "name-instance-name-filter": "",
+      "name-type": "",
       "selection-options": "Urvalsalternativ"
     },
     "default-grid-layout-manager": {
@@ -5472,6 +5555,21 @@
     "empty-transformations-message": {
       "add-transformation": "Lägg till omvandling"
     },
+    "general-settings-edit-view": {
+      "editable_options": {
+        "label": {
+          "editable": "",
+          "readonly": ""
+        }
+      },
+      "graph_tooltip_options": {
+        "label": {
+          "default": "",
+          "shared-crosshair": "",
+          "shared-tooltip": ""
+        }
+      }
+    },
     "get-edit-options": {
       "title": {
         "column-options": "Kolumnalternativ",
@@ -5502,7 +5600,8 @@
       "description-provide-dimensions-as-csv-dimension-name-dimension-id": "Tillhandahåll dimensioner som CSV: {{name}}, {{value}}",
       "group-by-options": "Gruppera efter alternativ",
       "label-data-source": "Datakälla",
-      "label-use-static-group-by-dimensions": "Använd statiska gruppdimensioner"
+      "label-use-static-group-by-dimensions": "Använd statiska gruppdimensioner",
+      "name-allow-custom-values": ""
     },
     "help-wizard": {
       "copy-to-clipboard": "Kopiera till urklippet",
@@ -5538,9 +5637,14 @@
       "apply": "Tillämpa"
     },
     "interval-variable-form": {
+      "description-auto-option": "",
       "description-calculated-value-below-threshold": "Det beräknade värdet kommer inte att vara under denna tröskel",
       "description-step-count": "Hur många gånger det aktuella tidsintervallet ska delas för att beräkna värdet",
-      "interval-options": "Intervallalternativ"
+      "interval-options": "Intervallalternativ",
+      "name-auto-option": "",
+      "name-min-interval": "",
+      "name-step-count": "",
+      "name-values": ""
     },
     "json-model-edit-view": {
       "cancel-button": {
@@ -5565,6 +5669,9 @@
       "title-name-already-exists": "Namnet finns redan"
     },
     "on-open-snapshot-original-dashboard": {
+      "confirmText": {
+        "proceed": ""
+      },
       "title": {
         "proceed-to-external-site": "Fortsätt till extern webbplats?"
       }
@@ -5600,6 +5707,8 @@
     },
     "panel-data-transformations-tab-rendered": {
       "add-another-transformation": "Lägg till ytterligare en transformering",
+      "body-delete-all-transformations": "",
+      "confirmText-delete-all": "",
       "delete-all-transformations": "Radera alla transformeringar",
       "title-delete-all-transformations": "Radera alla transformeringar?"
     },
@@ -5653,6 +5762,7 @@
       "description-optional": "Valfritt, om du vill extrahera en del av ett serienamn eller metriskt nodsegment.",
       "label-data-source": "Datakälla",
       "label-target-data-source": "Måldatakälla",
+      "name-regex": "",
       "query-options": "Frågealternativ",
       "selection-options": "Urvalsalternativ"
     },
@@ -5667,6 +5777,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "Är du säker på att du vill återställa instrumentpanelen till version {{version}}? Alla ändringar som inte sparats kommer att gå förlorade.",
+      "confirmText-restore-version": "",
       "title-restore-version": "Återställ versionen"
     },
     "save-button": {
@@ -5760,7 +5871,11 @@
     "selection-options-form": {
       "description-enables-multiple-values-selected": "Gör det möjligt att välja flera värden samtidigt",
       "description-enables-option-include-variables": "Aktiverar ett alternativ för att inkludera alla värden",
-      "description-enables-users-custom-values": "Gör det möjligt för användare att lägga till anpassade värden i listan"
+      "description-enables-users-custom-values": "Gör det möjligt för användare att lägga till anpassade värden i listan",
+      "name-allow-custom-values": "",
+      "name-custom-all-value": "",
+      "name-include-all-option": "",
+      "name-multi-value": ""
     },
     "share-button": {
       "aria-label-sharedropdownmenu": "Växla delningsmenyn"
@@ -5780,6 +5895,9 @@
         "copy-to-clipboard-failed": "Kopiering till urklipp misslyckades"
       }
     },
+    "text-box-variable": {
+      "name-default-value": ""
+    },
     "text-box-variable-form": {
       "placeholder-default-value-if-any": "(valfritt)",
       "text-options": "Textalternativ"
@@ -5803,6 +5921,8 @@
       }
     },
     "unlink-modal": {
+      "body-unlink-panel": "",
+      "confirmText-yes-unlink": "",
       "title-really-unlink-panel": "Vill du verkligen avlänka den här panelen?"
     },
     "unsaved-changes-modal": {
@@ -5819,6 +5939,9 @@
         }
       }
     },
+    "use-save-dashboard": {
+      "message-dashboard-saved": ""
+    },
     "variable-check-indicator": {
       "aria-label-variable-referenced-dashboard": "Den här variabeln refereras inte av någon variabel eller instrumentpanel.",
       "aria-label-variable-referenced-other-variables-dashboard": "Den här variabeln hänvisas till av andra variabler eller instrumentpanelen.",
@@ -5828,10 +5951,16 @@
     "variable-editor-form": {
       "aria-label-variable-editor-form": "Formulär för variabelsredigering",
       "back-to-list": "Tillbaka till listan",
+      "confirmText": {
+        "delete-variable": ""
+      },
       "delete": "Ta bort",
       "description-optional-display-name": "Valfritt visningsnamn",
       "description-template-variable-characters": "Namnet på mallvariabeln. (Högst 50 tecken)",
       "general": "Allmänt",
+      "name-description": "",
+      "name-label": "",
+      "name-name": "",
       "placeholder-descriptive-text": "Beskrivande text",
       "placeholder-label-name": "Etikettnamn",
       "placeholder-variable-name": "Variabelnamn",
@@ -5846,13 +5975,25 @@
       "variable": "Variabel"
     },
     "variable-editor-list-row": {
+      "body-delete-variable": "",
+      "confirmText-delete-variable": "",
       "title-delete-variable": "Radera variabel",
       "tooltip-duplicate-variable": "Dubblettvariabel",
       "tooltip-remove-variable": "Ta bort variabel"
     },
     "variable-hide-select": {
+      "hide_options": {
+        "label": {
+          "label": "",
+          "nothing": "",
+          "variable": ""
+        }
+      },
       "label": "Dölj"
     },
+    "variable-type-select": {
+      "name-variable-type": ""
+    },
     "variable-usages-button": {
       "title-show-usages": "Visar användningar för: {{variableId}}",
       "tooltip-show-usages": "Visa användningar"
@@ -5879,6 +6020,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "Växla val av version {{version}}",
       "date": "Datum",
+      "name-latest": "",
       "notes": "Anteckningar",
       "restore": "Återställ",
       "updated-by": "Uppdaterad av",
@@ -6266,7 +6408,8 @@
       }
     },
     "color-dimension-editor": {
-      "label-fixed-color": ""
+      "label-fixed-color": "",
+      "noOptionsMessage-no-fields-found": ""
     },
     "file-dropzone-custom-children": {
       "upload": "Ladda upp"
@@ -6304,6 +6447,7 @@
       },
       "label-limit": "Gräns",
       "label-value": "Värde",
+      "noOptionsMessage-no-fields-found": "",
       "scalar-options": {
         "description-clamped": "",
         "description-mod": "",
@@ -6312,9 +6456,15 @@
       }
     },
     "scale-dimension-editor": {
+      "fixed-value-option": {
+        "label": {
+          "fixed-value": ""
+        }
+      },
       "label-max": "Max",
       "label-min": "Min",
-      "label-value": "Värde"
+      "label-value": "Värde",
+      "noOptionsMessage-no-fields-found": ""
     },
     "text-dimension-editor": {
       "description-field": "",
@@ -6886,6 +7036,8 @@
       "aria-label-select-service-name-operator": "Välj operator för tjänstnamn",
       "aria-label-select-span-name": "Välj namn på intervall",
       "aria-label-select-span-name-operator": "Välj operator för intervallnamn",
+      "ariaLabel-select-max-span-duration": "",
+      "ariaLabel-select-min-span-duration": "",
       "label-collapse": "Intervallfilter",
       "label-duration": "Varaktighet",
       "label-service-name": "Namn på tjänst",
@@ -6956,6 +7108,8 @@
       "split-widen": "Bredda rutan"
     },
     "trace-page-actions": {
+      "ariaLabel-copy-trace-id": "",
+      "ariaLabel-export-trace": "",
       "give-feedback": "Ge feedback",
       "label-copied": "Kopierad! ",
       "label-export": "Exportera",
@@ -7093,6 +7247,7 @@
   },
   "folder-filter": {
     "clear-folder-button": "Rensa mappar",
+    "noOptionsMessage-no-folders-found": "",
     "select-aria-label": "Mappfilter",
     "select-placeholder": "Filtrera efter mapp"
   },
@@ -7161,7 +7316,53 @@
     "incomplete-request-error": "Tyvärr kunde jag inte slutföra din begäran. Försök igen.",
     "send-custom-feedback": "Skicka"
   },
+  "geo": {
+    "get-geometry-field": {
+      "warning-gazetteer-not-found": "",
+      "warning-no-geometry": "",
+      "warning-select-geohash": "",
+      "warning-select-lat-long": "",
+      "warning-select-lookup": "",
+      "warning-unable-to-find": ""
+    },
+    "location-editor": {
+      "geohash-field": {
+        "no-fields-message": ""
+      },
+      "latitude-field": {
+        "no-fields-message": ""
+      },
+      "longitude-field": {
+        "no-fields-message": ""
+      },
+      "lookup-field": {
+        "no-fields-message": ""
+      },
+      "name-gazetteer": "",
+      "name-geohash-field": "",
+      "name-latitude-field": "",
+      "name-location-mode": "",
+      "name-longitude-field": "",
+      "name-lookup-field": ""
+    },
+    "location-more-editor": {
+      "mode-options": {
+        "description-auto": "",
+        "description-coords": "",
+        "description-geohash": "",
+        "description-lookup": "",
+        "label-auto": "",
+        "label-coords": "",
+        "label-geohash": "",
+        "label-lookup": ""
+      }
+    }
+  },
   "geomap": {
+    "category-basemap-layer": "",
+    "category-map-controls": "",
+    "category-map-layers": "",
+    "category-map-view": "",
     "coordinates-map-view-editor": {
       "label-latitude": "Latitud",
       "label-longitude": "Longitud"
@@ -7170,6 +7371,14 @@
       "center": "Centrera:",
       "zoom": "Zooma:"
     },
+    "description-initial-view": "",
+    "description-mouse-wheel-zoom": "",
+    "description-share-view": "",
+    "description-show-attribution": "",
+    "description-show-debug": "",
+    "description-show-measure": "",
+    "description-show-scale": "",
+    "description-show-zoom": "",
     "fit-map-view-editor": {
       "all-layers-editor-fragment": {
         "label-layer": "Lager"
@@ -7192,6 +7401,14 @@
     "geomap-style-rules-editor": {
       "aria-label-add-geomap-style-rule": "Lägg till geomap-stilregel"
     },
+    "layer-editor": {
+      "category-base-layer": "",
+      "description-display-tooltip": "",
+      "name-data": "",
+      "name-display-tooltip": "",
+      "name-layer-type": "",
+      "name-opacity": ""
+    },
     "layers-editor": {
       "label-add-layer": "Lägg till lager",
       "no-layers": "Inga lager?"
@@ -7202,16 +7419,38 @@
       "label-zoom": "Zooma",
       "use-current-map-settings": "Använd aktuella kartinställningar"
     },
+    "markers-layer": {
+      "description-show-legend": "",
+      "name-show-legend": "",
+      "name-styles": ""
+    },
     "markers-legend": {
       "title-symbol": "Symbol"
     },
     "measure-overlay": {
       "tooltip-show-measure-tools": "Visa mätverktyg"
     },
+    "name-initial-view": "",
+    "name-mouse-wheel-zoom": "",
+    "name-share-view": "",
+    "name-show-attribution": "",
+    "name-show-debug": "",
+    "name-show-measure": "",
+    "name-show-scale": "",
+    "name-show-zoom": "",
+    "name-tooltip": "",
+    "photos-layer": {
+      "noFieldsMessage-no-string-fields": ""
+    },
     "plugin": {
       "basemap-layer-configured-server-admin": "Grundkartlagret konfigureras av serveradministratören."
     },
     "style-editor": {
+      "horizontal-align-options": {
+        "label-center": "",
+        "label-left": "",
+        "label-right": ""
+      },
       "label-align": "Justera",
       "label-baseline": "Baslinje",
       "label-color": "Färg",
@@ -7225,7 +7464,14 @@
       "label-symbol-vertical-align": "Vertikal justering av symbol",
       "label-text-label": "Textetikett",
       "label-x-offset": "X-förskjutning",
-      "label-y-offset": "Y-förskjutning"
+      "label-y-offset": "Y-förskjutning",
+      "placeholderText-select-symbol": "",
+      "placeholderText-select-symbol-or-add-text": "",
+      "vertical-align-options": {
+        "label-bottom": "",
+        "label-center": "",
+        "label-top": ""
+      }
     },
     "style-rule-editor": {
       "aria-label-comparison-operator": "Jämförelseoperator",
@@ -7236,6 +7482,15 @@
       "placeholder-feature-property": "Funktionsegenskap",
       "placeholder-numeric-value": "Numeriskt värde",
       "placeholder-value": "värde"
+    },
+    "tooltip-options": {
+      "description-details": "",
+      "description-none": "",
+      "label-details": "",
+      "label-none": ""
+    },
+    "utils": {
+      "get-next-layer-name": ""
     }
   },
   "get-enterprise": {
@@ -7485,7 +7740,8 @@
       "aria-label-selected-color": "{{colorLabel}} färg"
     },
     "confirm-button": {
-      "cancel": "Avbryt"
+      "cancel": "Avbryt",
+      "confirmText-delete": ""
     },
     "confirm-content": {
       "placeholder": "Skriv ”{{confirmPromptText}}” för att bekräfta"
@@ -7667,6 +7923,8 @@
     },
     "panel-chrome": {
       "aria-label-toggle-collapse": "växla dölj panel",
+      "ariaLabel-panel-loading": "",
+      "ariaLabel-panel-status": "",
       "tooltip-cancel": "Avbryt fråga",
       "tooltip-cancel-loading": "Avbryt fråga",
       "tooltip-stop-streaming": "Avsluta streaming",
@@ -7834,6 +8092,12 @@
       "footer-click-to-action": "Klicka för att {{actionTitle}}",
       "footer-click-to-navigate": "Klicka för att öppna {{linkTitle}}",
       "timestamp": "Tidsstämpel"
+    },
+    "week-start-picker": {
+      "weekStarts-label-default": "",
+      "weekStarts-label-monday": "",
+      "weekStarts-label-saturday": "",
+      "weekStarts-label-sunday": ""
     }
   },
   "graph": {
@@ -8212,6 +8476,10 @@
     "add-library-panel-modal": {
       "title-create-library-panel": "Skapa bibliotekspanel"
     },
+    "change-library-panel-modal": {
+      "confirmText-change": "",
+      "confirmText-replace": ""
+    },
     "confirm": {
       "delete-panel": "Vill du radera denna panel?"
     },
@@ -8656,6 +8924,8 @@
       "updated-on": "Uppdaterat den"
     },
     "snapshot-list-table": {
+      "body-delete": "",
+      "confirmText-delete": "",
       "title-delete": "Ta bort"
     },
     "unthemed-dashboard-import": {
@@ -8667,6 +8937,9 @@
       }
     }
   },
+  "metric-select": {
+    "noOptionsMessage-no-options-found": ""
+  },
   "migrate-to-cloud": {
     "build-snapshot": {
       "description": "Det här verktyget kan migrera vissa resurser från den här installationen till din molnstack. För att komma igång måste du skapa en ögonblicksbild av den här installationen. Att skapa en ögonblicksbild tar vanligtvis mindre än två minuter. Ögonblicksbilden lagras tillsammans med den här Grafana-installationen.",
@@ -9365,7 +9638,7 @@
     "marker": {
       "100-node-count": "> 100 noder",
       "aria-label-hidden-marker": "Dold nodmarkör: {{marker}}",
-      "node-count_one": "{{count}} nod",
+      "node-count_one": "{{count}} noder",
       "node-count_other": "{{count}} noder"
     },
     "node": {
@@ -9376,9 +9649,9 @@
       "aria-label-nodes-hidden-warning": "Varning för dolda noder",
       "computing-layout": "Beräknar layout",
       "no-data": "Inga data",
-      "hidden-nodes_one": "<0></0> {{count}} nod är dold av prestandaskäl.",
+      "hidden-nodes_one": "<0></0> {{count}} noder är dolda av prestandaskäl.",
       "hidden-nodes_other": "<0></0> {{count}} noder är dolda av prestandaskäl.",
-      "processed-nodes_one": "<0></0> Skiktad layout kan vara långsam med {{count}} nod.",
+      "processed-nodes_one": "<0></0> Skiktad layout kan vara långsam med {{count}} noder.",
       "processed-nodes_other": "<0></0> Skiktad layout kan vara långsam med {{count}} noder."
     },
     "node-graph-panel": {
@@ -9505,6 +9778,7 @@
     }
   },
   "org-picker": {
+    "noOptionsMessage-no-organizations-found": "",
     "select-placeholder": "Välj organisation"
   },
   "page": {
@@ -9727,6 +10001,7 @@
         "permission": "Du saknar behörighet att visa den här sidan.",
         "title-access-denied": "Åtkomst nekad"
       },
+      "error-loading-plugin": "",
       "no-root-app-page-component-found": "Ingen komponent för rotapplikationssidan hittades"
     },
     "browse": {
@@ -9770,8 +10045,7 @@
         "update-status-text": "plugins uppdaterade"
       },
       "versions": {
-        "confirmation-text-1": "Är du verkligen säker på att du vill nedgradera till version",
-        "confirmation-text-2": "Du borde normalt inte göra detta",
+        "confirmation-text": "",
         "downgrade-confirm": "Nedgradera",
         "downgrade-title": "Nedgradera tilläggsversion"
       }
@@ -9825,6 +10099,10 @@
     "empty-state": {
       "message": "Inga tilläggsprogram hittades"
     },
+    "extensions": {
+      "extension-error-alert-description": "",
+      "extension-error-alert-title": ""
+    },
     "extensions-log-data-source": {
       "message": {
         "ok": "OK"
@@ -9858,7 +10136,11 @@
       "updating": "Uppdatering"
     },
     "install-controls-button": {
-      "title-uninstall-modal": "Avinstallera {{plugin}}"
+      "title-uninstall-modal": "Avinstallera {{plugin}}",
+      "uninstall-controls": {
+        "body-uninstall-plugin": "",
+        "confirmText-confirm": ""
+      }
     },
     "install-controls-warning": {
       "body-not-published": "Detta tillägg har inte publicerat på <2>grafana.com/plugins</2> och kan inte hanteras via katalogen.",
@@ -10894,6 +11176,7 @@
     }
   },
   "service-account-picker": {
+    "noOptionsMessage-no-service-accounts-found": "",
     "select-aria-label": "Servicekontoväljare",
     "select-placeholder": "Börja skriva för att söka efter servicekonton"
   },
@@ -10939,6 +11222,10 @@
     },
     "service-account-page-unconnected": {
       "add-service-account-token": "Lägg till servicekontotoken",
+      "body-delete-service-account": "",
+      "body-disable-service-account": "",
+      "confirmText-delete-service-account": "",
+      "confirmText-disable-service-account": "",
       "delete-service-account": "Radera servicekonto",
       "disable-service-account": "Inaktivera servicekonto",
       "enable-service-account": "Aktivera servicekonto",
@@ -10965,6 +11252,7 @@
       "used-by": "Använd av"
     },
     "service-account-profile-row": {
+      "confirmText-save": "",
       "edit": "Redigera"
     },
     "service-account-role-row": {
@@ -10978,10 +11266,16 @@
     },
     "service-accounts-list-page-unconnected": {
       "add-service-account": "Lägg till servicekonto",
+      "body-delete-with-tokens": "",
+      "body-disable-service-account": "",
+      "confirmText-delete": "",
+      "confirmText-disable-service-account": "",
       "placeholder-search-service-account-by-name": "Sök servicekonto efter namn",
       "sub-title": "Servicekonton och deras token kan användas för att autentisera mot Grafana API. Läs mer i vår <2>dokumentation.</2>",
       "title-delete-service-account": "Radera servicekonto",
-      "title-disable-service-account": "Inaktivera servicekonto"
+      "title-disable-service-account": "Inaktivera servicekonto",
+      "body-delete_one": "",
+      "body-delete_other": ""
     },
     "token-expiration": {
       "content-this-token-has-expired": "Denna token har löpt ut",
@@ -11373,7 +11667,7 @@
       "label-never": ""
     },
     "status-history-panel": {
-      "too-many-points_one": "För många punkter för att visualisera ordentligt. <1></1>Uppdatera frågan för att returnera färre punkter. <3></3>({{count}} punkt mottagen)",
+      "too-many-points_one": "För många punkter för att visualisera ordentligt. <1></1>Uppdatera frågan för att returnera färre punkter. <3></3>({{count}} punkter mottagna)",
       "too-many-points_other": "För många punkter för att visualisera ordentligt. <1></1>Uppdatera frågan för att returnera färre punkter. <3></3>({{count}} punkter mottagna)"
     }
   },
@@ -11518,6 +11812,7 @@
     "tag-option-label": "Etikettalternativ"
   },
   "team-picker": {
+    "noOptionsMessage-no-teams-found": "",
     "select-aria-label": "Teamväljare",
     "select-placeholder": "Välj ett team"
   },
@@ -11843,6 +12138,7 @@
     "convert-field-type-transformer-editor": {
       "aria-label-add-a-convert-field-type-transformer": "Lägg till en transformering för att konvertera fälttyp",
       "aria-label-remove-convert-field-type-transformer": "Ta bort transformering för att konvertera fälttyp",
+      "convert-field-type": "",
       "label": {
         "browser": "Webbläsare",
         "utc": "UTC"
@@ -11885,6 +12181,11 @@
       "remove-enum-row-tooltip-delete": "Radera"
     },
     "extract-fields-transformer-editor": {
+      "field-name-picker-settings": {
+        "placeholderText": {
+          "select-field": ""
+        }
+      },
       "label-delimiter": "Avgränsare",
       "label-format": "Format",
       "label-keep-time": "Registrera tid",
@@ -11898,6 +12199,14 @@
       "aria-label-threshold-color": "Tröskelfärg"
     },
     "field-lookup-transformer-editor": {
+      "field-name-picker-settings": {
+        "noFieldsMessage": {
+          "no-text-fields-found": ""
+        },
+        "placeholderText": {
+          "select-text-field": ""
+        }
+      },
       "label-field": "Fält",
       "label-lookup": "Slå upp"
     },
@@ -11923,10 +12232,30 @@
     },
     "filter-by-value-transformer-editor": {
       "add-condition": "Lägg till villkor",
+      "filter-match": {
+        "label": {
+          "match-all": "",
+          "match-any": ""
+        }
+      },
+      "filter-types": {
+        "label": {
+          "exclude": "",
+          "include": ""
+        }
+      },
       "label-conditions": "Villkor",
       "label-filter-type": "Filtertyp"
     },
     "format-string-transfomer-editor": {
+      "field-name-picker-settings": {
+        "noFieldsMessage": {
+          "no-text-fields-found": ""
+        },
+        "placeholderText": {
+          "select-text-field": ""
+        }
+      },
       "label-field": "Fält",
       "label-format": "Format",
       "label-substring-range": "Delsträngsintervall"
@@ -12237,6 +12566,7 @@
     "title": "Organisationer"
   },
   "user-picker": {
+    "noOptionsMessage-no-users-found": "",
     "select-aria-label": "Användarväljare",
     "select-placeholder": "Börja skriva för att söka efter användare"
   },
@@ -12322,6 +12652,8 @@
       }
     },
     "confirm-delete-modal": {
+      "body-delete-variable": "",
+      "confirmText-delete": "",
       "title-delete-variable": "Radera variabel"
     },
     "create-ad-hoc-variable-adapter": {
@@ -12370,9 +12702,24 @@
       "label-refresh": "Uppdatera"
     },
     "query-variable-sort-select": {
-      "description-values-variable": "Hur värdena för denna variabel ska sorteras"
+      "description-values-variable": "Hur värdena för denna variabel ska sorteras",
+      "name-sort": "",
+      "sort_options": {
+        "label": {
+          "alphabetical-asc": "",
+          "alphabetical-caseinsensitive-asc": "",
+          "alphabetical-caseinsensitive-desc": "",
+          "alphabetical-desc": "",
+          "disabled": "",
+          "natural-asc": "",
+          "natural-desc": "",
+          "numerical-asc": "",
+          "numerical-desc": ""
+        }
+      }
     },
     "text-box-variable-editor": {
+      "name-default-value": "",
       "placeholder-default-value-if-any": "standardvärde, om något",
       "text-options": "Textalternativ"
     },
@@ -12401,6 +12748,8 @@
       "description-optional-display-name": "Valfritt visningsnamn",
       "description-template-variable-characters": "Namnet på mallvariabeln. (Högst 50 tecken)",
       "general": "Allmänt",
+      "name-label": "",
+      "name-name": "",
       "placeholder-descriptive-text": "Beskrivande text",
       "placeholder-label-name": "Etikettnamn",
       "placeholder-variable-name": "Variabelnamn",
@@ -12415,9 +12764,15 @@
       "tooltip-duplicate-variable": "Dubblettvariabel",
       "tooltip-remove-variable": "Ta bort variabel"
     },
+    "variable-editor-un-connected": {
+      "name-description": ""
+    },
     "variable-options": {
       "aria-label-toggle-all-values": "Växla alla värden"
     },
+    "variable-type-select": {
+      "name-select-variable-type": ""
+    },
     "variable-usages-button": {
       "tooltip-show-usages": "Visa användningar"
     },
diff --git a/public/locales/tr-TR/grafana.json b/public/locales/tr-TR/grafana.json
index 657b0842789..c8e93d19834 100644
--- a/public/locales/tr-TR/grafana.json
+++ b/public/locales/tr-TR/grafana.json
@@ -84,6 +84,7 @@
     "admin-feature-toggles-table": {
       "confirm-modal-body-1": "Bazı özellikler kararlı sürümdedir (Genel Kullanım/GA) ve varsayılan olarak etkindir, bazıları ise henüz ön aşamada olan Beta aşamasındadır ve erken benimseme için kullanılabilir durumdadır.",
       "confirm-modal-body-2": "Özelliklerde değişiklik yapmadan önce etkilerini gözden geçirmenizi öneririz.",
+      "confirmText-save-changes": "",
       "get-stage-cell": {
         "beta": "Beta",
         "content-general-availability": "Genel kullanılabilirlik",
@@ -96,14 +97,21 @@
     },
     "admin-orgs-table": {
       "aria-label-delete-org": "Kuruluşu sil",
+      "confirmText-delete": "",
       "title-delete": "Sil"
     },
     "anon-users": {
       "not-found": "Anonim kullanıcı bulunamadı."
     },
     "base-user-sessions": {
+      "body-force-logout-from-all-devices": "",
+      "confirmText-confirm-logout": "",
+      "confirmText-force-logout": "",
       "title-force-logout-from-all-devices": "Tüm cihazlardan çıkış yapmaya zorla"
     },
+    "change-org-button": {
+      "confirmText-save": ""
+    },
     "edit-org": {
       "access-denied": "Bu kuruluştaki kullanıcıları görme izniniz yok. Bu kuruluşu güncellemek için sunucu yöneticinize başvurun.",
       "heading": "Kuruluşu Düzenle",
@@ -208,9 +216,11 @@
       "not-editable": "Bu kullanıcının rolü, kimlik doğrulama sağlayıcınızdan eşitlendiği için düzenlenemez. Ayrıntılar için <1>Grafana kimlik doğrulama belgelerine</1> bakın."
     },
     "org-users-table": {
+      "body-delete": "",
       "columns": {
         "aria-label-role": "Rol"
       },
+      "confirmText-delete": "",
       "delete-aria-label": "Kullanıcıyı sil: {{name}}",
       "title-delete": "Sil"
     },
@@ -241,6 +251,9 @@
     "settings": {
       "info-description": "Bu sistem ayarları, grafana.ini veya custom.ini dosyalarında tanımlanmıştır (veya ENV değişkenlerinde geçersiz kılınabilir). Bu ayarları değiştirmek için şu anda Grafana'yı yeniden başlatmanız gerekmektedir."
     },
+    "un-themed-org-row": {
+      "confirmText-confirm-removal": ""
+    },
     "upgrade-info": {
       "title": "Enterprise lisansı"
     },
@@ -293,12 +306,17 @@
     },
     "user-permissions": {
       "change-button": "Değiştir",
+      "confirmText-change": "",
       "grafana-admin-key": "Grafana Yöneticisi",
       "grafana-admin-no": "Hayır",
       "grafana-admin-yes": "Evet",
       "title": "İzinler"
     },
     "user-profile": {
+      "body-delete": "",
+      "body-disable": "",
+      "confirmText-delete-user": "",
+      "confirmText-disable-user": "",
       "delete-button": "Kullanıcıyı sil",
       "disable-button": "Kullanıcıyı devre dışı bırak",
       "edit-button": "Düzenle",
@@ -312,6 +330,9 @@
       "title-delete-user": "Kullanıcıyı sil",
       "title-disable-user": "Kullanıcıyı devre dışı bırak"
     },
+    "user-profile-row": {
+      "confirmText-save": ""
+    },
     "user-sessions": {
       "browser-column": "Tarayıcı ve işletim sistemi",
       "force-logout-all-button": "Tüm cihazlardan çıkış yapmaya zorla",
@@ -461,6 +482,9 @@
       "label-muting-grouping-and-timings-optional": "Sessize alma, gruplandırma ve zamanlamalar (isteğe bağlı)",
       "title-muting-grouping-and-timings": "Sessize alma, gruplandırma ve zamanlamalar"
     },
+    "alert-manager-picker": {
+      "noOptionsMessage-no-datasources-found": ""
+    },
     "alert-menu": {
       "copy-link": "Bağlantıyı kopyala",
       "duplicate": "Çoğalt",
@@ -550,6 +574,7 @@
       "view-configuration": "Yapılandırmayı görüntüle"
     },
     "alertmanager-config": {
+      "confirmText-yes-reset-configuration": "",
       "gma-manual-configuration-description": "Grafana'nın dahili Alertmanager yapılandırması manuel olarak değiştirilemez. Bu yapılandırmayı değiştirmek için bireysel kaynakları kullanıcı arayüzü üzerinden düzenleyin.",
       "gma-manual-configuration-is-not-supported": "Manuel yapılandırma değişiklikleri desteklenmiyor",
       "message": {
@@ -564,11 +589,13 @@
       "title-resetting-alertmanager-configuration": "Alertmanager yapılandırması sıfırlanıyor"
     },
     "alertmanager-configuration-version-manager": {
+      "body-restore-configuration-version-unsaved-changes": "",
       "columns": {
         "compare": "Karşılaştır",
         "restore": "Geri yükle",
         "text-latest": "En son"
       },
+      "confirmText-yes-restore-configuration": "",
       "loading": "Yükleniyor...",
       "no-previous-configurations": "Önceki yapılandırmalar bulunamadı",
       "this-might-take-a-while": "Bu işlem biraz zaman alabilir...",
@@ -848,8 +875,10 @@
     },
     "contact-point-header": {
       "aria-label-more-actions": "\"{{contactPointName}}\" iletişim noktası için daha fazla işlem",
+      "ariaLabel-delete": "",
       "button-edit": "Düzenle",
       "button-view": "Görüntüle",
+      "export-ariaLabel-export": "",
       "export-label-export": "Dışa aktar",
       "label-delete": "Sil",
       "label-manage-permissions": "İzinleri yönet",
@@ -1384,6 +1413,7 @@
       "label-disable-resolved-message": "Çözümlenmiş mesajı devre dışı bırak"
     },
     "grafana-evaluation-behavior-step": {
+      "loadingMessage-loading-groups": "",
       "message": {
         "must-be-a-positive-integer": "Pozitif bir tam sayı olmalıdır.",
         "must-enter-a-group-name": "Bir grup adı girilmelidir"
@@ -1842,7 +1872,11 @@
             "other-data-sources": "Diğer veri kaynakları"
           }
         }
-      }
+      },
+      "noOptionsMessage-no-datasources-found": ""
+    },
+    "mute-timing-actions-button": {
+      "body-delete-mute-timing": ""
     },
     "mute-timing-actions-buttons": {
       "text-disabled": "Devre dışı",
@@ -2093,9 +2127,11 @@
       "update-errors": {
         "conflict": "Bildirim politikası ağacı başka bir kullanıcı tarafından güncellendi.",
         "error-code": "Hata mesajı: \"{{error}}\"",
-        "fallback": "Bildirim politikalarınız güncellenirken bir hata oluştu.",
+        "routes": {
+          "conflictingMatchers": ""
+        },
         "suffix": "Lütfen sayfayı yenileyin ve tekrar deneyin.",
-        "title": "Bildirim politikası kaydedilirken hata oluştu"
+        "title": ""
       },
       "n-more-policies_one": "{{count}} ek politika",
       "n-more-policies_other": "{{count}} ek politika"
@@ -2151,6 +2187,7 @@
     "query-and-expressions-step": {
       "add-query": "Sorgu ekle",
       "body-queries-expressions-configured": "Uyarı oluşturabilmek için en az bir sorgu veya ifade oluşturun",
+      "confirmText-deactivate": "",
       "expressions": "İfadeler",
       "loading-data-sources": "Veri kaynakları yükleniyor...",
       "manipulate-returned-queries-other-operations": "Sorgulardan dönen verileri matematik ve diğer işlemlerle düzenleyin.",
@@ -2218,6 +2255,7 @@
     "redirect-to-clone-rule": {
       "body-evaluation-group": "Kopyalanan kural için yeni bir değerlendirme grubu ayarlamanız gerekir çünkü orijinal kural sağlanmış ve kullanıcı arayüzünde oluşturulan kurallar için kullanılamaz.",
       "body-not-provisioned": "Yeni kural, sağlanmış bir kural olarak <1>işaretlenmeyecek</1>.",
+      "confirmText-copy": "",
       "title-copy-provisioned-alert-rule": "Sağlanan uyarı kuralını kopyala"
     },
     "redirect-to-rule-viewer": {
@@ -2415,8 +2453,6 @@
       "title-inspect-alert-rule": "Uyarı kuralını incele"
     },
     "rule-list": {
-      "cannot-find-rule-details-for": "{{uid}} UID'si için kural bilgileri bulunamadı",
-      "cannot-load-rule-details-for": "{{uid}} UID'si için kural bilgileri yüklenemedi",
       "configure-datasource": "Yapılandır",
       "draft-new-rule": "Yeni bir kural taslağı oluştur",
       "ds-error": {
@@ -2766,6 +2802,9 @@
       "existing-templates-selector-placeholder-choose-notification-template": "Bildirim şablonu seçin",
       "loading": "Yükleniyor...",
       "template-options": {
+        "ariaLabel": {
+          "select-notification-template": ""
+        },
         "label": {
           "select-notification-template": "Bildirim şablonu seçin"
         }
@@ -2792,6 +2831,8 @@
     },
     "templates-table": {
       "actions": "İşlemler",
+      "body-delete-template-group": "",
+      "confirmText-yes-delete": "",
       "no-templates-defined": "Tanımlanmış şablon yok.",
       "template-group": "Şablon grubu",
       "title-delete-template-group": "Şablon grubunu sil"
@@ -2919,6 +2960,11 @@
         "title-delete-contact-point": "İletişim noktasını sil"
       }
     },
+    "use-delete-modal": {
+      "modal": {
+        "confirmText-yes-delete": ""
+      }
+    },
     "use-delete-policy-modal": {
       "modal-element": {
         "title-delete-notification-policy": "Bildirim politikasını sil"
@@ -3075,7 +3121,8 @@
     "annotation-field-mapper": {
       "annotation": "Ek açıklama",
       "first-value": "İlk değer",
-      "from": ""
+      "from": "",
+      "noOptionsMessage-unknown-field-names": ""
     },
     "empty-state": {
       "button-title": "Ek açıklama sorgusu ekle",
@@ -3209,7 +3256,7 @@
       "team-ids-github": "Ekip kimliklerinin tam sayı listesi.",
       "team-ids-label": "Ekip kimlikleri",
       "team-ids-numbers": "Ekip kimlikleri sayı olmalıdır.",
-      "team-ids-other": "Ekip Kimliklerinin dize listesi.",
+      "team-ids-other": "",
       "team-ids-placeholder": "Ekip kimliklerini girin ve eklemek için Enter tuşuna basın",
       "teams-url-description": "Ekip kimliklerini sorgulamak için kullanılan URL. Ayarlanmazsa varsayılan değer /teams olur.",
       "teams-url-description-oauth": "\"{{ teamsURLLabel }}\" alanı yapılandırıldıysa \"{{ teamIDsAttributePathLabel }}\" alanı da yapılandırılmalıdır.",
@@ -3253,6 +3300,7 @@
       "additional-actions-menu": {
         "label-reset-to-default-values": "Varsayılan değerlere sıfırla"
       },
+      "confirmText-reset": "",
       "disable": "Devre dışı bırak",
       "disabling": "Devre dışı bırakılıyor...",
       "discard": "Vazgeç",
@@ -4180,8 +4228,8 @@
     }
   },
   "dashbaord-scene": {
-    "interval-variable-form": {
-      "description-auto-option": "Zaman aralığını belirtilen sayıya bölerek aralığı dinamik olarak hesaplar"
+    "variable-editor-form": {
+      "run-query": ""
     }
   },
   "dashboard": {
@@ -4343,6 +4391,9 @@
     },
     "dash-nav": {
       "on-open-snapshot-original": {
+        "confirmText": {
+          "proceed": ""
+        },
         "title": {
           "proceed-to-external-site": "Haricî siteye geçilsin mi?"
         }
@@ -4557,6 +4608,13 @@
           "editable": "Düzenlenebilir",
           "readonly": "Salt okunur"
         }
+      },
+      "graph_tooltip_options": {
+        "label": {
+          "default": "",
+          "shared-crosshair": "",
+          "shared-tooltip": ""
+        }
       }
     },
     "get-debug-dashboard": {
@@ -4861,6 +4919,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "Panoyu {{version}} sürümüne geri yüklemek istediğinize emin misiniz? Kaydedilmemiş tüm değişiklikler kaybolacaktır.",
+      "confirmText-restore-version": "",
       "title-restore-version": "Sürümü geri yükle"
     },
     "row-options-button": {
@@ -4911,6 +4970,9 @@
         "title-not-unique": "Bu başlık benzersiz değil"
       }
     },
+    "save-dashboard": {
+      "message-dashboard-saved": ""
+    },
     "save-dashboard-as-button": {
       "save-as": "Farklı kaydet"
     },
@@ -4945,6 +5007,7 @@
     "save-dashboard-error-proxy": {
       "body-name-exists": "Seçilen klasörde aynı isimde bir pano zaten mevcut. <1></1><2>Yine de bu panoyu kaydetmek istiyor musunuz?</2>",
       "body-version-mismatch": "Başka bir kullanıcı bu panoyu güncelledi<1></1><2>Yine de bu panoyu kaydetmek ister misiniz?</2>",
+      "confirmText-save-and-overwrite": "",
       "title-name-exists": "Çakışma",
       "title-version-mismatch": "Çakışma"
     },
@@ -5141,7 +5204,9 @@
       "label-apply-transformation-to": "Dönüşümü şuraya uygula"
     },
     "transformation-operation-row": {
+      "body-delete": "",
       "render-actions": {
+        "confirmText-delete": "",
         "title-debug": "Hata ayıklama",
         "title-disable-transformation": "Dönüşümü devre dışı bırakma",
         "title-filter": "Filtreleyin",
@@ -5163,10 +5228,14 @@
       "show-images": "Resimleri göster",
       "title-add-another-transformation": "Başka bir dönüşüm ekle"
     },
+    "un-theme-transformations-editor": {
+      "body-delete-all-transformations": ""
+    },
     "un-themed-transformations-editor": {
       "actions": {
         "add-another-transformation": "Başka bir dönüşüm ekle"
       },
+      "confirmText-delete-all": "",
       "delete-all-transformations": "Tüm dönüşümleri sil",
       "title-delete-all-transformations": "Tüm dönüşümler silinsin mi?",
       "tooltip-clear-search": "Aramayı temizle",
@@ -5203,6 +5272,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "{{version}} sürümünün seçimini değiştir",
       "date": "Tarih",
+      "name-latest": "",
       "notes": "Notlar",
       "restore": "Geri yükle",
       "updated-by": "Güncelleyen",
@@ -5279,7 +5349,8 @@
       "description-enables-users-custom-values": "Kullanıcıların listeye özel değerler eklemesine olanak tanır",
       "description-provide-dimensions-as-csv-dimension-name-dimension-id": "Boyutları CSV biçiminde girin: {{name}}, {{value}}",
       "label-data-source": "Veri kaynağı",
-      "label-use-static-key-dimensions": "Statik anahtar boyutları kullan"
+      "label-use-static-key-dimensions": "Statik anahtar boyutları kullan",
+      "name-allow-custom-values": ""
     },
     "add-to-dashboard": {
       "message": {
@@ -5352,6 +5423,9 @@
       }
     },
     "config-public-dashboard": {
+      "confirmText": {
+        "revoke-public-url": ""
+      },
       "title": {
         "revoke-public-url": "Herkese açık URL'yi iptal et"
       }
@@ -5363,6 +5437,7 @@
     },
     "custom-variable-form": {
       "custom-options": "Özel seçenekler",
+      "name-values-separated-comma": "",
       "selection-options": "Seçim ayarları"
     },
     "dashboard-edit-pane-renderer": {
@@ -5381,6 +5456,12 @@
       "label-type": "Tür",
       "label-url": "URL",
       "label-with-tags": "Etiketlerle birlikte",
+      "link-type-options": {
+        "label": {
+          "dashboards": "",
+          "link": ""
+        }
+      },
       "placeholder-open-dashboard": "Panoyu aç"
     },
     "dashboard-link-list": {
@@ -5427,6 +5508,8 @@
       "data-source-options": "Veri kaynağı seçenekleri",
       "description-instance-name-filter": "Değişken değer listesinde hangi veri kaynağı örneklerinin seçileceğini belirlemek için regex (düzenli ifade) filtresi. Tümü için boş bırakın.",
       "example-instance-name-filter": "Örnek: <codeExample />",
+      "name-instance-name-filter": "",
+      "name-type": "",
       "selection-options": "Seçim ayarları"
     },
     "default-grid-layout-manager": {
@@ -5472,6 +5555,21 @@
     "empty-transformations-message": {
       "add-transformation": "Dönüşüm ekle"
     },
+    "general-settings-edit-view": {
+      "editable_options": {
+        "label": {
+          "editable": "",
+          "readonly": ""
+        }
+      },
+      "graph_tooltip_options": {
+        "label": {
+          "default": "",
+          "shared-crosshair": "",
+          "shared-tooltip": ""
+        }
+      }
+    },
     "get-edit-options": {
       "title": {
         "column-options": "Sütun seçenekleri",
@@ -5502,7 +5600,8 @@
       "description-provide-dimensions-as-csv-dimension-name-dimension-id": "Boyutları CSV biçiminde girin: {{name}}, {{value}}",
       "group-by-options": "Seçeneklere göre grupla",
       "label-data-source": "Veri kaynağı",
-      "label-use-static-group-by-dimensions": "Statik grup boyutlarını kullan"
+      "label-use-static-group-by-dimensions": "Statik grup boyutlarını kullan",
+      "name-allow-custom-values": ""
     },
     "help-wizard": {
       "copy-to-clipboard": "Panoya kopyala",
@@ -5538,9 +5637,14 @@
       "apply": "Uygula"
     },
     "interval-variable-form": {
+      "description-auto-option": "",
       "description-calculated-value-below-threshold": "Hesaplanan değer bu eşiğin altına düşmeyecektir",
       "description-step-count": "Değeri hesaplamak için mevcut zaman aralığının kaç kez bölüneceği",
-      "interval-options": "Aralık seçenekleri"
+      "interval-options": "Aralık seçenekleri",
+      "name-auto-option": "",
+      "name-min-interval": "",
+      "name-step-count": "",
+      "name-values": ""
     },
     "json-model-edit-view": {
       "cancel-button": {
@@ -5565,6 +5669,9 @@
       "title-name-already-exists": "Bu ad zaten mevcut"
     },
     "on-open-snapshot-original-dashboard": {
+      "confirmText": {
+        "proceed": ""
+      },
       "title": {
         "proceed-to-external-site": "Haricî siteye geçilsin mi?"
       }
@@ -5600,6 +5707,8 @@
     },
     "panel-data-transformations-tab-rendered": {
       "add-another-transformation": "Başka bir dönüşüm ekle",
+      "body-delete-all-transformations": "",
+      "confirmText-delete-all": "",
       "delete-all-transformations": "Tüm dönüşümleri sil",
       "title-delete-all-transformations": "Tüm dönüşümler silinsin mi?"
     },
@@ -5653,6 +5762,7 @@
       "description-optional": "İsteğe bağlıdır, bir seri adının veya metrik düğüm parçasının bir kısmını çıkarmak istiyorsanız kullanılır.",
       "label-data-source": "Veri kaynağı",
       "label-target-data-source": "Hedef veri kaynağı",
+      "name-regex": "",
       "query-options": "Sorgu seçenekleri",
       "selection-options": "Seçim ayarları"
     },
@@ -5667,6 +5777,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "Panoyu {{version}} sürümüne geri yüklemek istediğinize emin misiniz? Kaydedilmemiş tüm değişiklikler kaybolacaktır.",
+      "confirmText-restore-version": "",
       "title-restore-version": "Sürümü geri yükle"
     },
     "save-button": {
@@ -5760,7 +5871,11 @@
     "selection-options-form": {
       "description-enables-multiple-values-selected": "Aynı anda birden fazla değerin seçilmesini sağlar",
       "description-enables-option-include-variables": "Tüm değerleri dahil etme seçeneğini etkinleştirir",
-      "description-enables-users-custom-values": "Kullanıcıların listeye özel değerler eklemesine olanak tanır"
+      "description-enables-users-custom-values": "Kullanıcıların listeye özel değerler eklemesine olanak tanır",
+      "name-allow-custom-values": "",
+      "name-custom-all-value": "",
+      "name-include-all-option": "",
+      "name-multi-value": ""
     },
     "share-button": {
       "aria-label-sharedropdownmenu": "Paylaşım menüsünü aç/kapat"
@@ -5780,6 +5895,9 @@
         "copy-to-clipboard-failed": "Panoya kopyalanamadı"
       }
     },
+    "text-box-variable": {
+      "name-default-value": ""
+    },
     "text-box-variable-form": {
       "placeholder-default-value-if-any": "(isteğe bağlı)",
       "text-options": "Metin seçenekleri"
@@ -5803,6 +5921,8 @@
       }
     },
     "unlink-modal": {
+      "body-unlink-panel": "",
+      "confirmText-yes-unlink": "",
       "title-really-unlink-panel": "Bu panelin bağlantısını gerçekten kaldırmak istiyor musunuz?"
     },
     "unsaved-changes-modal": {
@@ -5819,6 +5939,9 @@
         }
       }
     },
+    "use-save-dashboard": {
+      "message-dashboard-saved": ""
+    },
     "variable-check-indicator": {
       "aria-label-variable-referenced-dashboard": "Bu değişken başka bir değişken veya pano tarafından referans alınmıyor.",
       "aria-label-variable-referenced-other-variables-dashboard": "Bu değişkene diğer değişkenler veya panolar tarafından başvuruluyor.",
@@ -5828,10 +5951,16 @@
     "variable-editor-form": {
       "aria-label-variable-editor-form": "Değişken düzenleyici formu",
       "back-to-list": "Listeye geri dön",
+      "confirmText": {
+        "delete-variable": ""
+      },
       "delete": "Sil",
       "description-optional-display-name": "İsteğe bağlı görünen ad",
       "description-template-variable-characters": "Şablon değişkeninin adı. (Maks. 50 karakter)",
       "general": "Genel",
+      "name-description": "",
+      "name-label": "",
+      "name-name": "",
       "placeholder-descriptive-text": "Açıklayıcı metin",
       "placeholder-label-name": "Etiket adı",
       "placeholder-variable-name": "Değişken adı",
@@ -5846,13 +5975,25 @@
       "variable": "Değişken"
     },
     "variable-editor-list-row": {
+      "body-delete-variable": "",
+      "confirmText-delete-variable": "",
       "title-delete-variable": "Değişkeni sil",
       "tooltip-duplicate-variable": "Değişkeni çoğalt",
       "tooltip-remove-variable": "Değişkeni kaldır"
     },
     "variable-hide-select": {
+      "hide_options": {
+        "label": {
+          "label": "",
+          "nothing": "",
+          "variable": ""
+        }
+      },
       "label": "Gizle"
     },
+    "variable-type-select": {
+      "name-variable-type": ""
+    },
     "variable-usages-button": {
       "title-show-usages": "{{variableId}} için kullanım yerleri gösteriliyor",
       "tooltip-show-usages": "Kullanımları göster"
@@ -5879,6 +6020,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "{{version}} sürümünün seçimini değiştir",
       "date": "Tarih",
+      "name-latest": "",
       "notes": "Notlar",
       "restore": "Geri yükle",
       "updated-by": "Güncelleyen",
@@ -6266,7 +6408,8 @@
       }
     },
     "color-dimension-editor": {
-      "label-fixed-color": ""
+      "label-fixed-color": "",
+      "noOptionsMessage-no-fields-found": ""
     },
     "file-dropzone-custom-children": {
       "upload": "Yükle"
@@ -6304,6 +6447,7 @@
       },
       "label-limit": "Sınırlama",
       "label-value": "Değer",
+      "noOptionsMessage-no-fields-found": "",
       "scalar-options": {
         "description-clamped": "",
         "description-mod": "",
@@ -6312,9 +6456,15 @@
       }
     },
     "scale-dimension-editor": {
+      "fixed-value-option": {
+        "label": {
+          "fixed-value": ""
+        }
+      },
       "label-max": "Maks.",
       "label-min": "Min.",
-      "label-value": "Değer"
+      "label-value": "Değer",
+      "noOptionsMessage-no-fields-found": ""
     },
     "text-dimension-editor": {
       "description-field": "",
@@ -6886,6 +7036,8 @@
       "aria-label-select-service-name-operator": "Hizmet adını işlecini seç",
       "aria-label-select-span-name": "Zaman aralığı adı seç",
       "aria-label-select-span-name-operator": "Zaman aralığı adı işleci seçin",
+      "ariaLabel-select-max-span-duration": "",
+      "ariaLabel-select-min-span-duration": "",
       "label-collapse": "Zaman aralığı filtreleri",
       "label-duration": "Süre",
       "label-service-name": "Hizmet adı",
@@ -6956,6 +7108,8 @@
       "split-widen": "Bölmeyi genişlet"
     },
     "trace-page-actions": {
+      "ariaLabel-copy-trace-id": "",
+      "ariaLabel-export-trace": "",
       "give-feedback": "Geri bildirim gönder",
       "label-copied": "Kopyalandı!",
       "label-export": "Dışa aktar",
@@ -7093,6 +7247,7 @@
   },
   "folder-filter": {
     "clear-folder-button": "Klasörleri temizle",
+    "noOptionsMessage-no-folders-found": "",
     "select-aria-label": "Klasör filtresi",
     "select-placeholder": "Klasöre göre filtrele"
   },
@@ -7161,7 +7316,53 @@
     "incomplete-request-error": "Ne yazık ki isteğiniz gerçekleştirilemedi. Lütfen tekrar deneyin.",
     "send-custom-feedback": "Gönder"
   },
+  "geo": {
+    "get-geometry-field": {
+      "warning-gazetteer-not-found": "",
+      "warning-no-geometry": "",
+      "warning-select-geohash": "",
+      "warning-select-lat-long": "",
+      "warning-select-lookup": "",
+      "warning-unable-to-find": ""
+    },
+    "location-editor": {
+      "geohash-field": {
+        "no-fields-message": ""
+      },
+      "latitude-field": {
+        "no-fields-message": ""
+      },
+      "longitude-field": {
+        "no-fields-message": ""
+      },
+      "lookup-field": {
+        "no-fields-message": ""
+      },
+      "name-gazetteer": "",
+      "name-geohash-field": "",
+      "name-latitude-field": "",
+      "name-location-mode": "",
+      "name-longitude-field": "",
+      "name-lookup-field": ""
+    },
+    "location-more-editor": {
+      "mode-options": {
+        "description-auto": "",
+        "description-coords": "",
+        "description-geohash": "",
+        "description-lookup": "",
+        "label-auto": "",
+        "label-coords": "",
+        "label-geohash": "",
+        "label-lookup": ""
+      }
+    }
+  },
   "geomap": {
+    "category-basemap-layer": "",
+    "category-map-controls": "",
+    "category-map-layers": "",
+    "category-map-view": "",
     "coordinates-map-view-editor": {
       "label-latitude": "Enlem",
       "label-longitude": "Boylam"
@@ -7170,6 +7371,14 @@
       "center": "Merkez:",
       "zoom": "Yakınlaştırma:"
     },
+    "description-initial-view": "",
+    "description-mouse-wheel-zoom": "",
+    "description-share-view": "",
+    "description-show-attribution": "",
+    "description-show-debug": "",
+    "description-show-measure": "",
+    "description-show-scale": "",
+    "description-show-zoom": "",
     "fit-map-view-editor": {
       "all-layers-editor-fragment": {
         "label-layer": "Katman"
@@ -7192,6 +7401,14 @@
     "geomap-style-rules-editor": {
       "aria-label-add-geomap-style-rule": "Coğrafi harita stili kuralı ekle"
     },
+    "layer-editor": {
+      "category-base-layer": "",
+      "description-display-tooltip": "",
+      "name-data": "",
+      "name-display-tooltip": "",
+      "name-layer-type": "",
+      "name-opacity": ""
+    },
     "layers-editor": {
       "label-add-layer": "Katman ekle",
       "no-layers": "Katman yok mu?"
@@ -7202,16 +7419,38 @@
       "label-zoom": "Yakınlaştır",
       "use-current-map-settings": "Şu anki ayarları kullan"
     },
+    "markers-layer": {
+      "description-show-legend": "",
+      "name-show-legend": "",
+      "name-styles": ""
+    },
     "markers-legend": {
       "title-symbol": "Sembol"
     },
     "measure-overlay": {
       "tooltip-show-measure-tools": "Ölçüm araçlarını göster"
     },
+    "name-initial-view": "",
+    "name-mouse-wheel-zoom": "",
+    "name-share-view": "",
+    "name-show-attribution": "",
+    "name-show-debug": "",
+    "name-show-measure": "",
+    "name-show-scale": "",
+    "name-show-zoom": "",
+    "name-tooltip": "",
+    "photos-layer": {
+      "noFieldsMessage-no-string-fields": ""
+    },
     "plugin": {
       "basemap-layer-configured-server-admin": "Temel harita katmanı, sunucu yöneticisi tarafından yapılandırılır."
     },
     "style-editor": {
+      "horizontal-align-options": {
+        "label-center": "",
+        "label-left": "",
+        "label-right": ""
+      },
       "label-align": "Hizalama",
       "label-baseline": "Başlangıç değeri",
       "label-color": "Renk",
@@ -7225,7 +7464,14 @@
       "label-symbol-vertical-align": "Sembol dikey hizalama",
       "label-text-label": "Metin etiketi",
       "label-x-offset": "X ofseti",
-      "label-y-offset": "Y ofseti"
+      "label-y-offset": "Y ofseti",
+      "placeholderText-select-symbol": "",
+      "placeholderText-select-symbol-or-add-text": "",
+      "vertical-align-options": {
+        "label-bottom": "",
+        "label-center": "",
+        "label-top": ""
+      }
     },
     "style-rule-editor": {
       "aria-label-comparison-operator": "Karşılaştırma işleci",
@@ -7236,6 +7482,15 @@
       "placeholder-feature-property": "Özellik niteliği",
       "placeholder-numeric-value": "Sayısal değer",
       "placeholder-value": "değer"
+    },
+    "tooltip-options": {
+      "description-details": "",
+      "description-none": "",
+      "label-details": "",
+      "label-none": ""
+    },
+    "utils": {
+      "get-next-layer-name": ""
     }
   },
   "get-enterprise": {
@@ -7485,7 +7740,8 @@
       "aria-label-selected-color": "{{colorLabel}} rengi"
     },
     "confirm-button": {
-      "cancel": "İptal"
+      "cancel": "İptal",
+      "confirmText-delete": ""
     },
     "confirm-content": {
       "placeholder": "Onaylamak için \"{{confirmPromptText}}\" yazın"
@@ -7667,6 +7923,8 @@
     },
     "panel-chrome": {
       "aria-label-toggle-collapse": "paneli daralt/genişlet",
+      "ariaLabel-panel-loading": "",
+      "ariaLabel-panel-status": "",
       "tooltip-cancel": "Sorguyu iptal et",
       "tooltip-cancel-loading": "Sorguyu iptal et",
       "tooltip-stop-streaming": "Akışı durdur",
@@ -7834,6 +8092,12 @@
       "footer-click-to-action": "{{actionTitle}} için tıklayın",
       "footer-click-to-navigate": "{{linkTitle}} ögesini açmak için tıklayın",
       "timestamp": "Zaman damgası"
+    },
+    "week-start-picker": {
+      "weekStarts-label-default": "",
+      "weekStarts-label-monday": "",
+      "weekStarts-label-saturday": "",
+      "weekStarts-label-sunday": ""
     }
   },
   "graph": {
@@ -8212,6 +8476,10 @@
     "add-library-panel-modal": {
       "title-create-library-panel": "Kütüphane paneli oluştur"
     },
+    "change-library-panel-modal": {
+      "confirmText-change": "",
+      "confirmText-replace": ""
+    },
     "confirm": {
       "delete-panel": "Bu paneli kaldırmak istiyor musunuz?"
     },
@@ -8656,6 +8924,8 @@
       "updated-on": "Güncelleme tarihi"
     },
     "snapshot-list-table": {
+      "body-delete": "",
+      "confirmText-delete": "",
       "title-delete": "Sil"
     },
     "unthemed-dashboard-import": {
@@ -8667,6 +8937,9 @@
       }
     }
   },
+  "metric-select": {
+    "noOptionsMessage-no-options-found": ""
+  },
   "migrate-to-cloud": {
     "build-snapshot": {
       "description": "Bu araç, bazı kaynakları bu kurulumdan bulut altyapınıza taşımaya yardımcı olabilir. Başlamak için bu kurulumun bir anlık görüntüsünü oluşturmanız gerekir. Anlık görüntü oluşturma işlemi genellikle iki dakikadan kısa sürer. Anlık görüntü, bu Grafana kurulumu ile birlikte saklanır.",
@@ -9505,6 +9778,7 @@
     }
   },
   "org-picker": {
+    "noOptionsMessage-no-organizations-found": "",
     "select-placeholder": "Kuruluş Seçin"
   },
   "page": {
@@ -9727,6 +10001,7 @@
         "permission": "Bu sayfayı görüntüleme izniniz yok.",
         "title-access-denied": "Erişim reddedildi"
       },
+      "error-loading-plugin": "",
       "no-root-app-page-component-found": "Kök uygulama sayfası bileşeni bulunamadı"
     },
     "browse": {
@@ -9770,8 +10045,7 @@
         "update-status-text": "Eklentiler güncellendi"
       },
       "versions": {
-        "confirmation-text-1": "Şu eski sürüme düşürmek istediğinizden emin misiniz:",
-        "confirmation-text-2": "Bunu normalde yapmamalısınız",
+        "confirmation-text": "",
         "downgrade-confirm": "Eski sürüme düşür",
         "downgrade-title": "Eklenti sürümünü eski sürüme düşür"
       }
@@ -9825,6 +10099,10 @@
     "empty-state": {
       "message": "Eklenti bulunamadı"
     },
+    "extensions": {
+      "extension-error-alert-description": "",
+      "extension-error-alert-title": ""
+    },
     "extensions-log-data-source": {
       "message": {
         "ok": "Tamam"
@@ -9858,7 +10136,11 @@
       "updating": "Güncelleniyor"
     },
     "install-controls-button": {
-      "title-uninstall-modal": "{{plugin}} eklentisini kaldır"
+      "title-uninstall-modal": "{{plugin}} eklentisini kaldır",
+      "uninstall-controls": {
+        "body-uninstall-plugin": "",
+        "confirmText-confirm": ""
+      }
     },
     "install-controls-warning": {
       "body-not-published": "Bu eklenti <2>grafana.com/plugins</2> adresinde yayımlanmadı ve katalog üzerinden yönetilemez.",
@@ -10894,6 +11176,7 @@
     }
   },
   "service-account-picker": {
+    "noOptionsMessage-no-service-accounts-found": "",
     "select-aria-label": "Hizmet hesabı seçici",
     "select-placeholder": "Hizmet hesaplarını aramak için yazmaya başlayın"
   },
@@ -10939,6 +11222,10 @@
     },
     "service-account-page-unconnected": {
       "add-service-account-token": "Hizmet hesabı belirteci ekle",
+      "body-delete-service-account": "",
+      "body-disable-service-account": "",
+      "confirmText-delete-service-account": "",
+      "confirmText-disable-service-account": "",
       "delete-service-account": "Hizmet hesabını sil",
       "disable-service-account": "Hizmet hesabını devre dışı bırak",
       "enable-service-account": "Hizmet hesabını etkinleştir",
@@ -10965,6 +11252,7 @@
       "used-by": "Kullanan:"
     },
     "service-account-profile-row": {
+      "confirmText-save": "",
       "edit": "Düzenle"
     },
     "service-account-role-row": {
@@ -10978,10 +11266,16 @@
     },
     "service-accounts-list-page-unconnected": {
       "add-service-account": "Hizmet hesabı ekle",
+      "body-delete-with-tokens": "",
+      "body-disable-service-account": "",
+      "confirmText-delete": "",
+      "confirmText-disable-service-account": "",
       "placeholder-search-service-account-by-name": "Hizmet hesabını ada göre ara",
       "sub-title": "Hizmet hesapları ve belirteçleri, Grafana API'ye karşı kimlik doğrulamak için kullanılabilir. Daha fazla bilgi için <2>belgelerimize</2>",
       "title-delete-service-account": "Hizmet hesabını sil",
-      "title-disable-service-account": "Hizmet hesabını devre dışı bırak"
+      "title-disable-service-account": "Hizmet hesabını devre dışı bırak",
+      "body-delete_one": "",
+      "body-delete_other": ""
     },
     "token-expiration": {
       "content-this-token-has-expired": "Bu belirtecin süresi doldu",
@@ -11518,6 +11812,7 @@
     "tag-option-label": "Etiket seçeneği"
   },
   "team-picker": {
+    "noOptionsMessage-no-teams-found": "",
     "select-aria-label": "Ekip seçici",
     "select-placeholder": "Bir ekip seçin"
   },
@@ -11843,6 +12138,7 @@
     "convert-field-type-transformer-editor": {
       "aria-label-add-a-convert-field-type-transformer": "Alan türü dönüştürücü ekle",
       "aria-label-remove-convert-field-type-transformer": "Alan türü dönüştürücüyü kaldır",
+      "convert-field-type": "",
       "label": {
         "browser": "Tarayıcı",
         "utc": "UTC"
@@ -11885,6 +12181,11 @@
       "remove-enum-row-tooltip-delete": "Sil"
     },
     "extract-fields-transformer-editor": {
+      "field-name-picker-settings": {
+        "placeholderText": {
+          "select-field": ""
+        }
+      },
       "label-delimiter": "Sınırlayıcı",
       "label-format": "Biçim",
       "label-keep-time": "Zaman bilgisini koru",
@@ -11898,6 +12199,14 @@
       "aria-label-threshold-color": "Eşik rengi"
     },
     "field-lookup-transformer-editor": {
+      "field-name-picker-settings": {
+        "noFieldsMessage": {
+          "no-text-fields-found": ""
+        },
+        "placeholderText": {
+          "select-text-field": ""
+        }
+      },
       "label-field": "Alan",
       "label-lookup": "Arama"
     },
@@ -11923,10 +12232,30 @@
     },
     "filter-by-value-transformer-editor": {
       "add-condition": "Koşul ekle",
+      "filter-match": {
+        "label": {
+          "match-all": "",
+          "match-any": ""
+        }
+      },
+      "filter-types": {
+        "label": {
+          "exclude": "",
+          "include": ""
+        }
+      },
       "label-conditions": "Koşullar",
       "label-filter-type": "Filtre türü"
     },
     "format-string-transfomer-editor": {
+      "field-name-picker-settings": {
+        "noFieldsMessage": {
+          "no-text-fields-found": ""
+        },
+        "placeholderText": {
+          "select-text-field": ""
+        }
+      },
       "label-field": "Alan",
       "label-format": "Biçim",
       "label-substring-range": "Alt dize aralığı"
@@ -12237,6 +12566,7 @@
     "title": "Kuruluşlar"
   },
   "user-picker": {
+    "noOptionsMessage-no-users-found": "",
     "select-aria-label": "Kullanıcı seçici",
     "select-placeholder": "Kullanıcı aramak için yazmaya başlayın"
   },
@@ -12322,6 +12652,8 @@
       }
     },
     "confirm-delete-modal": {
+      "body-delete-variable": "",
+      "confirmText-delete": "",
       "title-delete-variable": "Değişkeni sil"
     },
     "create-ad-hoc-variable-adapter": {
@@ -12370,9 +12702,24 @@
       "label-refresh": "Yenile"
     },
     "query-variable-sort-select": {
-      "description-values-variable": "Bu değişkenin değerlerini nasıl sıralayacağınız"
+      "description-values-variable": "Bu değişkenin değerlerini nasıl sıralayacağınız",
+      "name-sort": "",
+      "sort_options": {
+        "label": {
+          "alphabetical-asc": "",
+          "alphabetical-caseinsensitive-asc": "",
+          "alphabetical-caseinsensitive-desc": "",
+          "alphabetical-desc": "",
+          "disabled": "",
+          "natural-asc": "",
+          "natural-desc": "",
+          "numerical-asc": "",
+          "numerical-desc": ""
+        }
+      }
     },
     "text-box-variable-editor": {
+      "name-default-value": "",
       "placeholder-default-value-if-any": "Varsayılan değer (varsa)",
       "text-options": "Metin seçenekleri"
     },
@@ -12401,6 +12748,8 @@
       "description-optional-display-name": "İsteğe bağlı görünen ad",
       "description-template-variable-characters": "Şablon değişkeninin adı. (Maks. 50 karakter)",
       "general": "Genel",
+      "name-label": "",
+      "name-name": "",
       "placeholder-descriptive-text": "Açıklayıcı metin",
       "placeholder-label-name": "Etiket adı",
       "placeholder-variable-name": "Değişken adı",
@@ -12415,9 +12764,15 @@
       "tooltip-duplicate-variable": "Değişkeni çoğalt",
       "tooltip-remove-variable": "Değişkeni kaldır"
     },
+    "variable-editor-un-connected": {
+      "name-description": ""
+    },
     "variable-options": {
       "aria-label-toggle-all-values": "Tüm değerleri aç/kapat"
     },
+    "variable-type-select": {
+      "name-select-variable-type": ""
+    },
     "variable-usages-button": {
       "tooltip-show-usages": "Kullanımları göster"
     },
diff --git a/public/locales/zh-Hans/grafana.json b/public/locales/zh-Hans/grafana.json
index ccac589a2e7..0d0c16a9ff1 100644
--- a/public/locales/zh-Hans/grafana.json
+++ b/public/locales/zh-Hans/grafana.json
@@ -84,6 +84,7 @@
     "admin-feature-toggles-table": {
       "confirm-modal-body-1": "有些功能可以稳定运行（GA 正式版）并默认启用，而有些功能目前处于初步的 Beta 测试阶段，可供用户提前试用。",
       "confirm-modal-body-2": "我们建议在修改之前了解每个功能更改所带来的影响。",
+      "confirmText-save-changes": "",
       "get-stage-cell": {
         "beta": "Beta 测试版",
         "content-general-availability": "正式发布",
@@ -96,14 +97,21 @@
     },
     "admin-orgs-table": {
       "aria-label-delete-org": "删除组织",
+      "confirmText-delete": "",
       "title-delete": "删除"
     },
     "anon-users": {
       "not-found": "未找到匿名用户。"
     },
     "base-user-sessions": {
+      "body-force-logout-from-all-devices": "",
+      "confirmText-confirm-logout": "",
+      "confirmText-force-logout": "",
       "title-force-logout-from-all-devices": "强制从所有设备退出登录"
     },
+    "change-org-button": {
+      "confirmText-save": ""
+    },
     "edit-org": {
       "access-denied": "您没有权限查看此组织中的用户。要更新此组织，请与服务器管理员联系。",
       "heading": "编辑组织",
@@ -208,9 +216,11 @@
       "not-editable": "此用户的角色不可编辑，因为它是从您的身份验证提供商同步而来的。有关详细信息，请参阅 <1>Grafana 身份验证文档</1>。"
     },
     "org-users-table": {
+      "body-delete": "",
       "columns": {
         "aria-label-role": "角色"
       },
+      "confirmText-delete": "",
       "delete-aria-label": "删除用户：{{name}}",
       "title-delete": "删除"
     },
@@ -241,6 +251,9 @@
     "settings": {
       "info-description": "这些系统设置在 grafana.ini 或 custom.ini 中定义（或在 ENV 变量中覆盖）。要更改这些设置，您当前需要重新启动 Grafana。"
     },
+    "un-themed-org-row": {
+      "confirmText-confirm-removal": ""
+    },
     "upgrade-info": {
       "title": "企业许可"
     },
@@ -293,12 +306,17 @@
     },
     "user-permissions": {
       "change-button": "更改",
+      "confirmText-change": "",
       "grafana-admin-key": "Grafana 管理员",
       "grafana-admin-no": "否",
       "grafana-admin-yes": "是",
       "title": "权限"
     },
     "user-profile": {
+      "body-delete": "",
+      "body-disable": "",
+      "confirmText-delete-user": "",
+      "confirmText-disable-user": "",
       "delete-button": "删除用户",
       "disable-button": "禁用用户",
       "edit-button": "编辑",
@@ -312,6 +330,9 @@
       "title-delete-user": "删除用户",
       "title-disable-user": "禁用用户"
     },
+    "user-profile-row": {
+      "confirmText-save": ""
+    },
     "user-sessions": {
       "browser-column": "浏览器和操作系统",
       "force-logout-all-button": "强制从所有设备退出登录",
@@ -457,6 +478,9 @@
       "label-muting-grouping-and-timings-optional": "静音、分组和时间设定（可选）",
       "title-muting-grouping-and-timings": "静音、分组和时间设定"
     },
+    "alert-manager-picker": {
+      "noOptionsMessage-no-datasources-found": ""
+    },
     "alert-menu": {
       "copy-link": "复制链接",
       "duplicate": "复制",
@@ -546,6 +570,7 @@
       "view-configuration": "视图配置"
     },
     "alertmanager-config": {
+      "confirmText-yes-reset-configuration": "",
       "gma-manual-configuration-description": "无法手动更改内部 Grafana Alertmanager 配置。要更改此配置，请通过用户界面编辑单个资源。",
       "gma-manual-configuration-is-not-supported": "不支持手动进行配置更改",
       "message": {
@@ -560,11 +585,13 @@
       "title-resetting-alertmanager-configuration": "重置 Alertmanager 配置"
     },
     "alertmanager-configuration-version-manager": {
+      "body-restore-configuration-version-unsaved-changes": "",
       "columns": {
         "compare": "比较",
         "restore": "还原",
         "text-latest": "最近"
       },
+      "confirmText-yes-restore-configuration": "",
       "loading": "加载中...",
       "no-previous-configurations": "没有以前的配置",
       "this-might-take-a-while": "这可能需要一点时间...",
@@ -844,8 +871,10 @@
     },
     "contact-point-header": {
       "aria-label-more-actions": "联络点“{{contactPointName}}“的更多操作",
+      "ariaLabel-delete": "",
       "button-edit": "编辑",
       "button-view": "查看",
+      "export-ariaLabel-export": "",
       "export-label-export": "导出",
       "label-delete": "删除",
       "label-manage-permissions": "管理权限",
@@ -1378,6 +1407,7 @@
       "label-disable-resolved-message": "禁用已解除消息"
     },
     "grafana-evaluation-behavior-step": {
+      "loadingMessage-loading-groups": "",
       "message": {
         "must-be-a-positive-integer": "必须是正整数。",
         "must-enter-a-group-name": "输入一个组名称"
@@ -1835,7 +1865,11 @@
             "other-data-sources": "其他数据源"
           }
         }
-      }
+      },
+      "noOptionsMessage-no-datasources-found": ""
+    },
+    "mute-timing-actions-button": {
+      "body-delete-mute-timing": ""
     },
     "mute-timing-actions-buttons": {
       "text-disabled": "已禁用",
@@ -2085,9 +2119,11 @@
       "update-errors": {
         "conflict": "通知策略树已由其他用户更新。",
         "error-code": "错误消息：“{{error}}”",
-        "fallback": "更新通知策略时出错。",
+        "routes": {
+          "conflictingMatchers": ""
+        },
         "suffix": "请刷新页面并重试。",
-        "title": "保存通知策略时出错"
+        "title": ""
       },
       "n-more-policies_other": "其他 {{count}} 个策略"
     },
@@ -2142,6 +2178,7 @@
     "query-and-expressions-step": {
       "add-query": "添加查询",
       "body-queries-expressions-configured": "至少创建一个查询或表达式以发出警报",
+      "confirmText-deactivate": "",
       "expressions": "表达式",
       "loading-data-sources": "正在加载数据源...",
       "manipulate-returned-queries-other-operations": "使用数学和其他操作处理查询返回的数据。",
@@ -2209,6 +2246,7 @@
     "redirect-to-clone-rule": {
       "body-evaluation-group": "您需要为复制的规则设置一个新的评估组，因为原始规则已预配，无法用于在用户界面中创建的规则。",
       "body-not-provisioned": "新规则将<1>不会</1>被标记为预配规则。",
+      "confirmText-copy": "",
       "title-copy-provisioned-alert-rule": "复制已预置的警报规则"
     },
     "redirect-to-rule-viewer": {
@@ -2405,8 +2443,6 @@
       "title-inspect-alert-rule": "检查警报规则"
     },
     "rule-list": {
-      "cannot-find-rule-details-for": "找不到 UID {{uid}} 的规则详情",
-      "cannot-load-rule-details-for": "无法加载 UID {{uid}} 的规则详情",
       "configure-datasource": "配置",
       "draft-new-rule": "起草新规则",
       "ds-error": {
@@ -2753,6 +2789,9 @@
       "existing-templates-selector-placeholder-choose-notification-template": "选择通知模板",
       "loading": "加载中...",
       "template-options": {
+        "ariaLabel": {
+          "select-notification-template": ""
+        },
         "label": {
           "select-notification-template": "选择通知模板"
         }
@@ -2779,6 +2818,8 @@
     },
     "templates-table": {
       "actions": "操作",
+      "body-delete-template-group": "",
+      "confirmText-yes-delete": "",
       "no-templates-defined": "未定义模板。",
       "template-group": "模板组",
       "title-delete-template-group": "删除模板组"
@@ -2906,6 +2947,11 @@
         "title-delete-contact-point": "删除联络点"
       }
     },
+    "use-delete-modal": {
+      "modal": {
+        "confirmText-yes-delete": ""
+      }
+    },
     "use-delete-policy-modal": {
       "modal-element": {
         "title-delete-notification-policy": "删除通知策略"
@@ -3062,7 +3108,8 @@
     "annotation-field-mapper": {
       "annotation": "注释",
       "first-value": "第一个值",
-      "from": ""
+      "from": "",
+      "noOptionsMessage-unknown-field-names": ""
     },
     "empty-state": {
       "button-title": "添加注释查询",
@@ -3196,7 +3243,7 @@
       "team-ids-github": "团队 ID 的整数列表。",
       "team-ids-label": "团队 ID",
       "team-ids-numbers": "团队 ID 必须是数字。",
-      "team-ids-other": "团队 ID 的字符串列表。",
+      "team-ids-other": "",
       "team-ids-placeholder": "输入团队 ID 并按 Enter 键添加",
       "teams-url-description": "用于查询团队 ID 的网址。如果未设置，则默认值为 /teams。",
       "teams-url-description-oauth": "如果配置了“{{ teamsURLLabel }}”，则还必须配置“{{ teamIDsAttributePathLabel }}”。",
@@ -3240,6 +3287,7 @@
       "additional-actions-menu": {
         "label-reset-to-default-values": "重置为默认值"
       },
+      "confirmText-reset": "",
       "disable": "禁用",
       "disabling": "正在禁用…",
       "discard": "丢弃",
@@ -4162,8 +4210,8 @@
     }
   },
   "dashbaord-scene": {
-    "interval-variable-form": {
-      "description-auto-option": "通过将时间范围除以指定的计数来动态计算间隔"
+    "variable-editor-form": {
+      "run-query": ""
     }
   },
   "dashboard": {
@@ -4325,6 +4373,9 @@
     },
     "dash-nav": {
       "on-open-snapshot-original": {
+        "confirmText": {
+          "proceed": ""
+        },
         "title": {
           "proceed-to-external-site": "继续前往外部网站？"
         }
@@ -4539,6 +4590,13 @@
           "editable": "可编辑",
           "readonly": "只读"
         }
+      },
+      "graph_tooltip_options": {
+        "label": {
+          "default": "",
+          "shared-crosshair": "",
+          "shared-tooltip": ""
+        }
       }
     },
     "get-debug-dashboard": {
@@ -4842,6 +4900,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "您确定要将数据面板还原到版本吗 {{version}}？所有未保存的更改都将丢失。",
+      "confirmText-restore-version": "",
       "title-restore-version": "恢复版本"
     },
     "row-options-button": {
@@ -4892,6 +4951,9 @@
         "title-not-unique": "此标题并不唯一"
       }
     },
+    "save-dashboard": {
+      "message-dashboard-saved": ""
+    },
     "save-dashboard-as-button": {
       "save-as": "另存为"
     },
@@ -4926,6 +4988,7 @@
     "save-dashboard-error-proxy": {
       "body-name-exists": "所选文件夹中已存在具有相同名称的数据面板。<1></1><2>您仍然要保存此数据面板吗？。",
       "body-version-mismatch": "其他人已更新此数据面板<1></1><2>您仍然要保存此数据面板吗？。",
+      "confirmText-save-and-overwrite": "",
       "title-name-exists": "冲突",
       "title-version-mismatch": "冲突"
     },
@@ -5122,7 +5185,9 @@
       "label-apply-transformation-to": "将转换应用于"
     },
     "transformation-operation-row": {
+      "body-delete": "",
       "render-actions": {
+        "confirmText-delete": "",
         "title-debug": "调试",
         "title-disable-transformation": "禁用转换",
         "title-filter": "筛选条件",
@@ -5144,10 +5209,14 @@
       "show-images": "显示图像",
       "title-add-another-transformation": "添加其他转换"
     },
+    "un-theme-transformations-editor": {
+      "body-delete-all-transformations": ""
+    },
     "un-themed-transformations-editor": {
       "actions": {
         "add-another-transformation": "添加其他转换"
       },
+      "confirmText-delete-all": "",
       "delete-all-transformations": "删除所有转换",
       "title-delete-all-transformations": "删除所有转换？",
       "tooltip-clear-search": "清除搜索",
@@ -5184,6 +5253,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "切换版本 {{version}} 的选择",
       "date": "日期",
+      "name-latest": "",
       "notes": "备注",
       "restore": "还原",
       "updated-by": "更新人",
@@ -5260,7 +5330,8 @@
       "description-enables-users-custom-values": "允许用户向列表中添加自定义值",
       "description-provide-dimensions-as-csv-dimension-name-dimension-id": "以 CSV 格式提供维度：{{name}}, {{value}}",
       "label-data-source": "数据源",
-      "label-use-static-key-dimensions": "使用静态键维度"
+      "label-use-static-key-dimensions": "使用静态键维度",
+      "name-allow-custom-values": ""
     },
     "add-to-dashboard": {
       "message": {
@@ -5333,6 +5404,9 @@
       }
     },
     "config-public-dashboard": {
+      "confirmText": {
+        "revoke-public-url": ""
+      },
       "title": {
         "revoke-public-url": "撤销公共网址"
       }
@@ -5344,6 +5418,7 @@
     },
     "custom-variable-form": {
       "custom-options": "自定义选项",
+      "name-values-separated-comma": "",
       "selection-options": "选择内容选项"
     },
     "dashboard-edit-pane-renderer": {
@@ -5362,6 +5437,12 @@
       "label-type": "类型",
       "label-url": "URL",
       "label-with-tags": "带标记",
+      "link-type-options": {
+        "label": {
+          "dashboards": "",
+          "link": ""
+        }
+      },
       "placeholder-open-dashboard": "打开数据面板"
     },
     "dashboard-link-list": {
@@ -5408,6 +5489,8 @@
       "data-source-options": "数据源选项",
       "description-instance-name-filter": "正则表达式筛选器，用于在变量值列表中选择数据源实例。保留所有为空。",
       "example-instance-name-filter": "示例：<codeExample />",
+      "name-instance-name-filter": "",
+      "name-type": "",
       "selection-options": "选择内容选项"
     },
     "default-grid-layout-manager": {
@@ -5453,6 +5536,21 @@
     "empty-transformations-message": {
       "add-transformation": "添加转换"
     },
+    "general-settings-edit-view": {
+      "editable_options": {
+        "label": {
+          "editable": "",
+          "readonly": ""
+        }
+      },
+      "graph_tooltip_options": {
+        "label": {
+          "default": "",
+          "shared-crosshair": "",
+          "shared-tooltip": ""
+        }
+      }
+    },
     "get-edit-options": {
       "title": {
         "column-options": "列选项",
@@ -5483,7 +5581,8 @@
       "description-provide-dimensions-as-csv-dimension-name-dimension-id": "以 CSV 格式提供维度：{{name}}, {{value}}",
       "group-by-options": "分组选项",
       "label-data-source": "数据源",
-      "label-use-static-group-by-dimensions": "使用静态组维度"
+      "label-use-static-group-by-dimensions": "使用静态组维度",
+      "name-allow-custom-values": ""
     },
     "help-wizard": {
       "copy-to-clipboard": "复制到剪贴板",
@@ -5519,9 +5618,14 @@
       "apply": "应用"
     },
     "interval-variable-form": {
+      "description-auto-option": "",
       "description-calculated-value-below-threshold": "计算值不会低于此阈值",
       "description-step-count": "计算值时，应将当前时间范围除以多少倍",
-      "interval-options": "间隔选项"
+      "interval-options": "间隔选项",
+      "name-auto-option": "",
+      "name-min-interval": "",
+      "name-step-count": "",
+      "name-values": ""
     },
     "json-model-edit-view": {
       "cancel-button": {
@@ -5545,6 +5649,9 @@
       "title-name-already-exists": "名称已存在"
     },
     "on-open-snapshot-original-dashboard": {
+      "confirmText": {
+        "proceed": ""
+      },
       "title": {
         "proceed-to-external-site": "继续前往外部网站？"
       }
@@ -5580,6 +5687,8 @@
     },
     "panel-data-transformations-tab-rendered": {
       "add-another-transformation": "添加其他转换",
+      "body-delete-all-transformations": "",
+      "confirmText-delete-all": "",
       "delete-all-transformations": "删除所有转换",
       "title-delete-all-transformations": "删除所有转换？"
     },
@@ -5633,6 +5742,7 @@
       "description-optional": "可选，如果您想要提取序列名称或指标节点段的一部分。",
       "label-data-source": "数据源",
       "label-target-data-source": "目标数据源",
+      "name-regex": "",
       "query-options": "查询选项",
       "selection-options": "选择内容选项"
     },
@@ -5647,6 +5757,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "您确定要将数据面板还原到版本吗 {{version}}？所有未保存的更改都将丢失。",
+      "confirmText-restore-version": "",
       "title-restore-version": "恢复版本"
     },
     "save-button": {
@@ -5739,7 +5850,11 @@
     "selection-options-form": {
       "description-enables-multiple-values-selected": "允许同时选择多个值",
       "description-enables-option-include-variables": "启用选项以包含所有值",
-      "description-enables-users-custom-values": "允许用户向列表中添加自定义值"
+      "description-enables-users-custom-values": "允许用户向列表中添加自定义值",
+      "name-allow-custom-values": "",
+      "name-custom-all-value": "",
+      "name-include-all-option": "",
+      "name-multi-value": ""
     },
     "share-button": {
       "aria-label-sharedropdownmenu": "切换共享菜单"
@@ -5759,6 +5874,9 @@
         "copy-to-clipboard-failed": "复制到剪贴板失败"
       }
     },
+    "text-box-variable": {
+      "name-default-value": ""
+    },
     "text-box-variable-form": {
       "placeholder-default-value-if-any": "（可选）",
       "text-options": "文本选项"
@@ -5782,6 +5900,8 @@
       }
     },
     "unlink-modal": {
+      "body-unlink-panel": "",
+      "confirmText-yes-unlink": "",
       "title-really-unlink-panel": "您确定要取消关联此面板吗？"
     },
     "unsaved-changes-modal": {
@@ -5798,6 +5918,9 @@
         }
       }
     },
+    "use-save-dashboard": {
+      "message-dashboard-saved": ""
+    },
     "variable-check-indicator": {
       "aria-label-variable-referenced-dashboard": "此变量未被任何变量或数据面板引用。",
       "aria-label-variable-referenced-other-variables-dashboard": "此变量被其他变量或数据面板引用。",
@@ -5807,10 +5930,16 @@
     "variable-editor-form": {
       "aria-label-variable-editor-form": "变量编辑器表单",
       "back-to-list": "回到列表",
+      "confirmText": {
+        "delete-variable": ""
+      },
       "delete": "删除",
       "description-optional-display-name": "可选显示名称",
       "description-template-variable-characters": "模板变量的名称。（最多 50 个字符）",
       "general": "概况",
+      "name-description": "",
+      "name-label": "",
+      "name-name": "",
       "placeholder-descriptive-text": "描述性文本",
       "placeholder-label-name": "标签名称",
       "placeholder-variable-name": "变量名称",
@@ -5825,13 +5954,25 @@
       "variable": "变量"
     },
     "variable-editor-list-row": {
+      "body-delete-variable": "",
+      "confirmText-delete-variable": "",
       "title-delete-variable": "删除变量",
       "tooltip-duplicate-variable": "复制变量",
       "tooltip-remove-variable": "移除变量"
     },
     "variable-hide-select": {
+      "hide_options": {
+        "label": {
+          "label": "",
+          "nothing": "",
+          "variable": ""
+        }
+      },
       "label": "隐藏"
     },
+    "variable-type-select": {
+      "name-variable-type": ""
+    },
     "variable-usages-button": {
       "title-show-usages": "显示使用情况：{{variableId}}",
       "tooltip-show-usages": "显示使用情况"
@@ -5858,6 +5999,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "切换版本 {{version}} 的选择",
       "date": "日期",
+      "name-latest": "",
       "notes": "备注",
       "restore": "还原",
       "updated-by": "更新人",
@@ -6245,7 +6387,8 @@
       }
     },
     "color-dimension-editor": {
-      "label-fixed-color": ""
+      "label-fixed-color": "",
+      "noOptionsMessage-no-fields-found": ""
     },
     "file-dropzone-custom-children": {
       "upload": "上传"
@@ -6283,6 +6426,7 @@
       },
       "label-limit": "限制",
       "label-value": "值",
+      "noOptionsMessage-no-fields-found": "",
       "scalar-options": {
         "description-clamped": "",
         "description-mod": "",
@@ -6291,9 +6435,15 @@
       }
     },
     "scale-dimension-editor": {
+      "fixed-value-option": {
+        "label": {
+          "fixed-value": ""
+        }
+      },
       "label-max": "最高",
       "label-min": "最小",
-      "label-value": "值"
+      "label-value": "值",
+      "noOptionsMessage-no-fields-found": ""
     },
     "text-dimension-editor": {
       "description-field": "",
@@ -6865,6 +7015,8 @@
       "aria-label-select-service-name-operator": "选择服务名称运算符",
       "aria-label-select-span-name": "选择跨度名称",
       "aria-label-select-span-name-operator": "选择跨度名称运算符",
+      "ariaLabel-select-max-span-duration": "",
+      "ariaLabel-select-min-span-duration": "",
       "label-collapse": "跨度筛选器",
       "label-duration": "持续时间",
       "label-service-name": "服务名称",
@@ -6935,6 +7087,8 @@
       "split-widen": "宽窗格"
     },
     "trace-page-actions": {
+      "ariaLabel-copy-trace-id": "",
+      "ariaLabel-export-trace": "",
       "give-feedback": "提供反馈",
       "label-copied": "已复制！",
       "label-export": "导出",
@@ -7072,6 +7226,7 @@
   },
   "folder-filter": {
     "clear-folder-button": "清除文件夹",
+    "noOptionsMessage-no-folders-found": "",
     "select-aria-label": "文件夹筛选",
     "select-placeholder": "按文件夹筛选"
   },
@@ -7140,7 +7295,53 @@
     "incomplete-request-error": "很抱歉，我无法完成您的请求。请重试。",
     "send-custom-feedback": "发送"
   },
+  "geo": {
+    "get-geometry-field": {
+      "warning-gazetteer-not-found": "",
+      "warning-no-geometry": "",
+      "warning-select-geohash": "",
+      "warning-select-lat-long": "",
+      "warning-select-lookup": "",
+      "warning-unable-to-find": ""
+    },
+    "location-editor": {
+      "geohash-field": {
+        "no-fields-message": ""
+      },
+      "latitude-field": {
+        "no-fields-message": ""
+      },
+      "longitude-field": {
+        "no-fields-message": ""
+      },
+      "lookup-field": {
+        "no-fields-message": ""
+      },
+      "name-gazetteer": "",
+      "name-geohash-field": "",
+      "name-latitude-field": "",
+      "name-location-mode": "",
+      "name-longitude-field": "",
+      "name-lookup-field": ""
+    },
+    "location-more-editor": {
+      "mode-options": {
+        "description-auto": "",
+        "description-coords": "",
+        "description-geohash": "",
+        "description-lookup": "",
+        "label-auto": "",
+        "label-coords": "",
+        "label-geohash": "",
+        "label-lookup": ""
+      }
+    }
+  },
   "geomap": {
+    "category-basemap-layer": "",
+    "category-map-controls": "",
+    "category-map-layers": "",
+    "category-map-view": "",
     "coordinates-map-view-editor": {
       "label-latitude": "纬度",
       "label-longitude": "经度"
@@ -7149,6 +7350,14 @@
       "center": "居中：",
       "zoom": "缩放："
     },
+    "description-initial-view": "",
+    "description-mouse-wheel-zoom": "",
+    "description-share-view": "",
+    "description-show-attribution": "",
+    "description-show-debug": "",
+    "description-show-measure": "",
+    "description-show-scale": "",
+    "description-show-zoom": "",
     "fit-map-view-editor": {
       "all-layers-editor-fragment": {
         "label-layer": "图层"
@@ -7171,6 +7380,14 @@
     "geomap-style-rules-editor": {
       "aria-label-add-geomap-style-rule": "添加地理图样式规则"
     },
+    "layer-editor": {
+      "category-base-layer": "",
+      "description-display-tooltip": "",
+      "name-data": "",
+      "name-display-tooltip": "",
+      "name-layer-type": "",
+      "name-opacity": ""
+    },
     "layers-editor": {
       "label-add-layer": "添加图层",
       "no-layers": "没有图层？"
@@ -7181,16 +7398,38 @@
       "label-zoom": "缩放",
       "use-current-map-settings": "使用当前地图设置"
     },
+    "markers-layer": {
+      "description-show-legend": "",
+      "name-show-legend": "",
+      "name-styles": ""
+    },
     "markers-legend": {
       "title-symbol": "符号"
     },
     "measure-overlay": {
       "tooltip-show-measure-tools": "显示测量工具"
     },
+    "name-initial-view": "",
+    "name-mouse-wheel-zoom": "",
+    "name-share-view": "",
+    "name-show-attribution": "",
+    "name-show-debug": "",
+    "name-show-measure": "",
+    "name-show-scale": "",
+    "name-show-zoom": "",
+    "name-tooltip": "",
+    "photos-layer": {
+      "noFieldsMessage-no-string-fields": ""
+    },
     "plugin": {
       "basemap-layer-configured-server-admin": "基础地图图层由服务器管理员配置。"
     },
     "style-editor": {
+      "horizontal-align-options": {
+        "label-center": "",
+        "label-left": "",
+        "label-right": ""
+      },
       "label-align": "对齐",
       "label-baseline": "基线",
       "label-color": "颜色",
@@ -7204,7 +7443,14 @@
       "label-symbol-vertical-align": "符号垂直对齐",
       "label-text-label": "文本标签",
       "label-x-offset": "X 轴偏移量",
-      "label-y-offset": "Y 轴偏移量"
+      "label-y-offset": "Y 轴偏移量",
+      "placeholderText-select-symbol": "",
+      "placeholderText-select-symbol-or-add-text": "",
+      "vertical-align-options": {
+        "label-bottom": "",
+        "label-center": "",
+        "label-top": ""
+      }
     },
     "style-rule-editor": {
       "aria-label-comparison-operator": "比较运算符",
@@ -7215,6 +7461,15 @@
       "placeholder-feature-property": "功能属性",
       "placeholder-numeric-value": "数字值",
       "placeholder-value": "值"
+    },
+    "tooltip-options": {
+      "description-details": "",
+      "description-none": "",
+      "label-details": "",
+      "label-none": ""
+    },
+    "utils": {
+      "get-next-layer-name": ""
     }
   },
   "get-enterprise": {
@@ -7464,7 +7719,8 @@
       "aria-label-selected-color": "{{colorLabel}} 颜色"
     },
     "confirm-button": {
-      "cancel": "取消"
+      "cancel": "取消",
+      "confirmText-delete": ""
     },
     "confirm-content": {
       "placeholder": "键入“{{confirmPromptText}}”以确认"
@@ -7646,6 +7902,8 @@
     },
     "panel-chrome": {
       "aria-label-toggle-collapse": "切换折叠面板",
+      "ariaLabel-panel-loading": "",
+      "ariaLabel-panel-status": "",
       "tooltip-cancel": "取消查询",
       "tooltip-cancel-loading": "取消查询",
       "tooltip-stop-streaming": "停止流媒体传输",
@@ -7813,6 +8071,12 @@
       "footer-click-to-action": "点击以 {{actionTitle}}",
       "footer-click-to-navigate": "点击打开 {{linkTitle}}",
       "timestamp": "时间戳"
+    },
+    "week-start-picker": {
+      "weekStarts-label-default": "",
+      "weekStarts-label-monday": "",
+      "weekStarts-label-saturday": "",
+      "weekStarts-label-sunday": ""
     }
   },
   "graph": {
@@ -8189,6 +8453,10 @@
     "add-library-panel-modal": {
       "title-create-library-panel": "创建库面板"
     },
+    "change-library-panel-modal": {
+      "confirmText-change": "",
+      "confirmText-replace": ""
+    },
     "confirm": {
       "delete-panel": "要删除这个面板吗？"
     },
@@ -8630,6 +8898,8 @@
       "updated-on": "更新日期"
     },
     "snapshot-list-table": {
+      "body-delete": "",
+      "confirmText-delete": "",
       "title-delete": "删除"
     },
     "unthemed-dashboard-import": {
@@ -8641,6 +8911,9 @@
       }
     }
   },
+  "metric-select": {
+    "noOptionsMessage-no-options-found": ""
+  },
   "migrate-to-cloud": {
     "build-snapshot": {
       "description": "此工具可以将某些资源从此安装迁移到您的云堆栈。要开始使用，您需要创建此安装的快照。创建快照通常需要不到两分钟的时间。快照与此 Grafana 安装一起存储。",
@@ -9476,6 +9749,7 @@
     }
   },
   "org-picker": {
+    "noOptionsMessage-no-organizations-found": "",
     "select-placeholder": "选择组织"
   },
   "page": {
@@ -9698,6 +9972,7 @@
         "permission": "您无权查看此页面。",
         "title-access-denied": "访问被拒绝"
       },
+      "error-loading-plugin": "",
       "no-root-app-page-component-found": "找不到根应用页面组件"
     },
     "browse": {
@@ -9741,8 +10016,7 @@
         "update-status-text": "插件已更新"
       },
       "versions": {
-        "confirmation-text-1": "您确定要降级版本吗",
-        "confirmation-text-2": "您通常不应该这样做",
+        "confirmation-text": "",
         "downgrade-confirm": "降级",
         "downgrade-title": "降级插件版本"
       }
@@ -9796,6 +10070,10 @@
     "empty-state": {
       "message": "找不到插件"
     },
+    "extensions": {
+      "extension-error-alert-description": "",
+      "extension-error-alert-title": ""
+    },
     "extensions-log-data-source": {
       "message": {
         "ok": "好"
@@ -9829,7 +10107,11 @@
       "updating": "正在更新"
     },
     "install-controls-button": {
-      "title-uninstall-modal": "卸载 {{plugin}}"
+      "title-uninstall-modal": "卸载 {{plugin}}",
+      "uninstall-controls": {
+        "body-uninstall-plugin": "",
+        "confirmText-confirm": ""
+      }
     },
     "install-controls-warning": {
       "body-not-published": "此插件未发布到 <2>grafana.com/plugins</2>，无法通过目录管理。",
@@ -10860,6 +11142,7 @@
     }
   },
   "service-account-picker": {
+    "noOptionsMessage-no-service-accounts-found": "",
     "select-aria-label": "服务帐户选取器",
     "select-placeholder": "开始键入以搜索服务账户"
   },
@@ -10905,6 +11188,10 @@
     },
     "service-account-page-unconnected": {
       "add-service-account-token": "添加服务账户令牌",
+      "body-delete-service-account": "",
+      "body-disable-service-account": "",
+      "confirmText-delete-service-account": "",
+      "confirmText-disable-service-account": "",
       "delete-service-account": "删除服务账户",
       "disable-service-account": "禁用服务账户",
       "enable-service-account": "启用服务账户",
@@ -10931,6 +11218,7 @@
       "used-by": "使用方"
     },
     "service-account-profile-row": {
+      "confirmText-save": "",
       "edit": "编辑"
     },
     "service-account-role-row": {
@@ -10944,10 +11232,15 @@
     },
     "service-accounts-list-page-unconnected": {
       "add-service-account": "添加服务账户",
+      "body-delete-with-tokens": "",
+      "body-disable-service-account": "",
+      "confirmText-delete": "",
+      "confirmText-disable-service-account": "",
       "placeholder-search-service-account-by-name": "按名称搜索服务账户",
       "sub-title": "服务账户及其令牌可用于对 Grafana API 进行身份验证。不妨在我们的<2>文档</2>中了解更多信息。",
       "title-delete-service-account": "删除服务账户",
-      "title-disable-service-account": "禁用服务账户"
+      "title-disable-service-account": "禁用服务账户",
+      "body-delete_other": ""
     },
     "token-expiration": {
       "content-this-token-has-expired": "此令牌已过期",
@@ -11483,6 +11776,7 @@
     "tag-option-label": "标记选项"
   },
   "team-picker": {
+    "noOptionsMessage-no-teams-found": "",
     "select-aria-label": "团队选择器",
     "select-placeholder": "选择一个团队"
   },
@@ -11808,6 +12102,7 @@
     "convert-field-type-transformer-editor": {
       "aria-label-add-a-convert-field-type-transformer": "添加转换字段类型转换器",
       "aria-label-remove-convert-field-type-transformer": "移除转换字段类型转换器",
+      "convert-field-type": "",
       "label": {
         "browser": "浏览器",
         "utc": "UTC"
@@ -11850,6 +12145,11 @@
       "remove-enum-row-tooltip-delete": "删除"
     },
     "extract-fields-transformer-editor": {
+      "field-name-picker-settings": {
+        "placeholderText": {
+          "select-field": ""
+        }
+      },
       "label-delimiter": "分隔符",
       "label-format": "格式",
       "label-keep-time": "保持时间",
@@ -11863,6 +12163,14 @@
       "aria-label-threshold-color": "阈值颜色"
     },
     "field-lookup-transformer-editor": {
+      "field-name-picker-settings": {
+        "noFieldsMessage": {
+          "no-text-fields-found": ""
+        },
+        "placeholderText": {
+          "select-text-field": ""
+        }
+      },
       "label-field": "字段",
       "label-lookup": "查阅"
     },
@@ -11888,10 +12196,30 @@
     },
     "filter-by-value-transformer-editor": {
       "add-condition": "添加条件",
+      "filter-match": {
+        "label": {
+          "match-all": "",
+          "match-any": ""
+        }
+      },
+      "filter-types": {
+        "label": {
+          "exclude": "",
+          "include": ""
+        }
+      },
       "label-conditions": "条件",
       "label-filter-type": "筛选器类型"
     },
     "format-string-transfomer-editor": {
+      "field-name-picker-settings": {
+        "noFieldsMessage": {
+          "no-text-fields-found": ""
+        },
+        "placeholderText": {
+          "select-text-field": ""
+        }
+      },
       "label-field": "字段",
       "label-format": "格式",
       "label-substring-range": "子字符串范围"
@@ -12202,6 +12530,7 @@
     "title": "组织"
   },
   "user-picker": {
+    "noOptionsMessage-no-users-found": "",
     "select-aria-label": "用户选取器",
     "select-placeholder": "开始键入以搜索用户"
   },
@@ -12287,6 +12616,8 @@
       }
     },
     "confirm-delete-modal": {
+      "body-delete-variable": "",
+      "confirmText-delete": "",
       "title-delete-variable": "删除变量"
     },
     "create-ad-hoc-variable-adapter": {
@@ -12335,9 +12666,24 @@
       "label-refresh": "刷新"
     },
     "query-variable-sort-select": {
-      "description-values-variable": "如何对此变量的值进行排序"
+      "description-values-variable": "如何对此变量的值进行排序",
+      "name-sort": "",
+      "sort_options": {
+        "label": {
+          "alphabetical-asc": "",
+          "alphabetical-caseinsensitive-asc": "",
+          "alphabetical-caseinsensitive-desc": "",
+          "alphabetical-desc": "",
+          "disabled": "",
+          "natural-asc": "",
+          "natural-desc": "",
+          "numerical-asc": "",
+          "numerical-desc": ""
+        }
+      }
     },
     "text-box-variable-editor": {
+      "name-default-value": "",
       "placeholder-default-value-if-any": "默认值（如有）",
       "text-options": "文本选项"
     },
@@ -12366,6 +12712,8 @@
       "description-optional-display-name": "可选显示名称",
       "description-template-variable-characters": "模板变量的名称。（最多 50 个字符）",
       "general": "概况",
+      "name-label": "",
+      "name-name": "",
       "placeholder-descriptive-text": "描述性文本",
       "placeholder-label-name": "标签名称",
       "placeholder-variable-name": "变量名称",
@@ -12380,9 +12728,15 @@
       "tooltip-duplicate-variable": "复制变量",
       "tooltip-remove-variable": "移除变量"
     },
+    "variable-editor-un-connected": {
+      "name-description": ""
+    },
     "variable-options": {
       "aria-label-toggle-all-values": "切换所有值"
     },
+    "variable-type-select": {
+      "name-select-variable-type": ""
+    },
     "variable-usages-button": {
       "tooltip-show-usages": "显示使用情况"
     },
diff --git a/public/locales/zh-Hant/grafana.json b/public/locales/zh-Hant/grafana.json
index 1562d9aee81..52210f14da4 100644
--- a/public/locales/zh-Hant/grafana.json
+++ b/public/locales/zh-Hant/grafana.json
@@ -84,6 +84,7 @@
     "admin-feature-toggles-table": {
       "confirm-modal-body-1": "部分功能穩定 (GA) 且預設為啟用，有些功能目前則處於初步 Beta 階段，可供早期採用。",
       "confirm-modal-body-2": "建議您在進行修改前了解各項功能變更的影響。",
+      "confirmText-save-changes": "",
       "get-stage-cell": {
         "beta": "Beta",
         "content-general-availability": "一般可用性",
@@ -96,14 +97,21 @@
     },
     "admin-orgs-table": {
       "aria-label-delete-org": "刪除組織",
+      "confirmText-delete": "",
       "title-delete": "刪除"
     },
     "anon-users": {
       "not-found": "未找到匿名使用者。"
     },
     "base-user-sessions": {
+      "body-force-logout-from-all-devices": "",
+      "confirmText-confirm-logout": "",
+      "confirmText-force-logout": "",
       "title-force-logout-from-all-devices": "強制從所有裝置登出"
     },
+    "change-org-button": {
+      "confirmText-save": ""
+    },
     "edit-org": {
       "access-denied": "您沒有權限查看此組織中的使用者。若要更新此組織，請聯絡您的伺服器管理員。",
       "heading": "編輯組織",
@@ -208,9 +216,11 @@
       "not-editable": "無法編輯此使用者的角色，因為其角色來自您的驗證提供者同步設定。詳情請參閱 <1>Grafana 身分驗證文件</1>。"
     },
     "org-users-table": {
+      "body-delete": "",
       "columns": {
         "aria-label-role": "角色"
       },
+      "confirmText-delete": "",
       "delete-aria-label": "刪除使用者：{{name}}",
       "title-delete": "刪除"
     },
@@ -241,6 +251,9 @@
     "settings": {
       "info-description": "這些系統設定在 grafana.ini 或 custom.ini 中定義（或在 ENV 變數中覆寫）。若要變更這些設定，您目前需要重新啟動 Grafana。"
     },
+    "un-themed-org-row": {
+      "confirmText-confirm-removal": ""
+    },
     "upgrade-info": {
       "title": "企業版授權"
     },
@@ -293,12 +306,17 @@
     },
     "user-permissions": {
       "change-button": "變更",
+      "confirmText-change": "",
       "grafana-admin-key": "Grafana 管理員",
       "grafana-admin-no": "否",
       "grafana-admin-yes": "是",
       "title": "權限"
     },
     "user-profile": {
+      "body-delete": "",
+      "body-disable": "",
+      "confirmText-delete-user": "",
+      "confirmText-disable-user": "",
       "delete-button": "刪除使用者",
       "disable-button": "停用使用者",
       "edit-button": "編輯",
@@ -312,6 +330,9 @@
       "title-delete-user": "刪除使用者",
       "title-disable-user": "停用使用者"
     },
+    "user-profile-row": {
+      "confirmText-save": ""
+    },
     "user-sessions": {
       "browser-column": "瀏覽器和作業系統",
       "force-logout-all-button": "強制從所有裝置登出",
@@ -457,6 +478,9 @@
       "label-muting-grouping-and-timings-optional": "靜音、分組和時間（選填）",
       "title-muting-grouping-and-timings": "靜音、分組和時間"
     },
+    "alert-manager-picker": {
+      "noOptionsMessage-no-datasources-found": ""
+    },
     "alert-menu": {
       "copy-link": "複製網址",
       "duplicate": "重複",
@@ -546,6 +570,7 @@
       "view-configuration": "檢視設定"
     },
     "alertmanager-config": {
+      "confirmText-yes-reset-configuration": "",
       "gma-manual-configuration-description": "無法手動變更內部 Grafana Alertmanager 設定。若要變更此設定，請透過使用者介面編輯個別資源。",
       "gma-manual-configuration-is-not-supported": "不支援手動設定變更",
       "message": {
@@ -560,11 +585,13 @@
       "title-resetting-alertmanager-configuration": "正在重設 Alertmanager 設定"
     },
     "alertmanager-configuration-version-manager": {
+      "body-restore-configuration-version-unsaved-changes": "",
       "columns": {
         "compare": "比較",
         "restore": "還原",
         "text-latest": "最新"
       },
+      "confirmText-yes-restore-configuration": "",
       "loading": "正在載入…",
       "no-previous-configurations": "沒有之前的設定",
       "this-might-take-a-while": "這可能需要一段時間...",
@@ -844,8 +871,10 @@
     },
     "contact-point-header": {
       "aria-label-more-actions": "聯絡點「{{contactPointName}}」的更多動作",
+      "ariaLabel-delete": "",
       "button-edit": "編輯",
       "button-view": "檢視",
+      "export-ariaLabel-export": "",
       "export-label-export": "匯出",
       "label-delete": "刪除",
       "label-manage-permissions": "管理權限",
@@ -1378,6 +1407,7 @@
       "label-disable-resolved-message": "停用已解決的訊息"
     },
     "grafana-evaluation-behavior-step": {
+      "loadingMessage-loading-groups": "",
       "message": {
         "must-be-a-positive-integer": "必須為正整數。",
         "must-enter-a-group-name": "必須輸入群組名稱"
@@ -1835,7 +1865,11 @@
             "other-data-sources": "其他資料來源"
           }
         }
-      }
+      },
+      "noOptionsMessage-no-datasources-found": ""
+    },
+    "mute-timing-actions-button": {
+      "body-delete-mute-timing": ""
     },
     "mute-timing-actions-buttons": {
       "text-disabled": "已停用",
@@ -2085,9 +2119,11 @@
       "update-errors": {
         "conflict": "通知政策樹已由其他使用者更新。",
         "error-code": "錯誤訊息：「{{error}}」",
-        "fallback": "更新通知政策時發生錯誤。",
+        "routes": {
+          "conflictingMatchers": ""
+        },
         "suffix": "請重新整理此頁面並再試一次。",
-        "title": "儲存通知政策時發生錯誤"
+        "title": ""
       },
       "n-more-policies_other": "{{count}} 個其他政策"
     },
@@ -2142,6 +2178,7 @@
     "query-and-expressions-step": {
       "add-query": "新增查詢",
       "body-queries-expressions-configured": "建立至少一個查詢或表達式以便收到警報",
+      "confirmText-deactivate": "",
       "expressions": "表達式",
       "loading-data-sources": "正在載入資料來源…",
       "manipulate-returned-queries-other-operations": "使用數學和其他運算來處理查詢返回的資料。",
@@ -2209,6 +2246,7 @@
     "redirect-to-clone-rule": {
       "body-evaluation-group": "您需要為複製的規則設定新的評估群組，因為原始群組已佈建，無法用於在使用者介面中建立的規則。",
       "body-not-provisioned": "新規則將<1>不會</1>標記為已佈建的規則。",
+      "confirmText-copy": "",
       "title-copy-provisioned-alert-rule": "複製已設定的警報規則"
     },
     "redirect-to-rule-viewer": {
@@ -2405,8 +2443,6 @@
       "title-inspect-alert-rule": "檢查警報規則"
     },
     "rule-list": {
-      "cannot-find-rule-details-for": "找不到「UID {{uid}}」的規則詳細資料",
-      "cannot-load-rule-details-for": "無法載入「UID {{uid}}」的規則詳細資料",
       "configure-datasource": "設定",
       "draft-new-rule": "撰寫新規則",
       "ds-error": {
@@ -2753,6 +2789,9 @@
       "existing-templates-selector-placeholder-choose-notification-template": "選擇通知範本",
       "loading": "正在載入…",
       "template-options": {
+        "ariaLabel": {
+          "select-notification-template": ""
+        },
         "label": {
           "select-notification-template": "選取通知範本"
         }
@@ -2779,6 +2818,8 @@
     },
     "templates-table": {
       "actions": "動作",
+      "body-delete-template-group": "",
+      "confirmText-yes-delete": "",
       "no-templates-defined": "未定義任何範本。",
       "template-group": "範本群組",
       "title-delete-template-group": "刪除範本群組"
@@ -2906,6 +2947,11 @@
         "title-delete-contact-point": "刪除聯絡點"
       }
     },
+    "use-delete-modal": {
+      "modal": {
+        "confirmText-yes-delete": ""
+      }
+    },
     "use-delete-policy-modal": {
       "modal-element": {
         "title-delete-notification-policy": "刪除通知政策"
@@ -3062,7 +3108,8 @@
     "annotation-field-mapper": {
       "annotation": "註解",
       "first-value": "第一項數值",
-      "from": ""
+      "from": "",
+      "noOptionsMessage-unknown-field-names": ""
     },
     "empty-state": {
       "button-title": "新增注釋查詢",
@@ -3196,7 +3243,7 @@
       "team-ids-github": "團隊 ID 的整數清單。",
       "team-ids-label": "團隊 ID",
       "team-ids-numbers": "團隊 ID 必須為數字。",
-      "team-ids-other": "團隊識別碼的字串清單。",
+      "team-ids-other": "",
       "team-ids-placeholder": "輸入團隊 ID，然後按 Enter 新增",
       "teams-url-description": "用於查詢團隊 ID 的網址。如未設定，則預設值為 /teams。",
       "teams-url-description-oauth": "若您設定了「{{ teamsURLLabel }}」，則必須同時設定「{{ teamIDsAttributePathLabel }}」。",
@@ -3240,6 +3287,7 @@
       "additional-actions-menu": {
         "label-reset-to-default-values": "重設為預設值"
       },
+      "confirmText-reset": "",
       "disable": "停用",
       "disabling": "正在停用…",
       "discard": "捨棄",
@@ -4162,8 +4210,8 @@
     }
   },
   "dashbaord-scene": {
-    "interval-variable-form": {
-      "description-auto-option": "透過將時間範圍除以指定的計數來動態計算間隔"
+    "variable-editor-form": {
+      "run-query": ""
     }
   },
   "dashboard": {
@@ -4325,6 +4373,9 @@
     },
     "dash-nav": {
       "on-open-snapshot-original": {
+        "confirmText": {
+          "proceed": ""
+        },
         "title": {
           "proceed-to-external-site": "是否繼續前往外部網站？"
         }
@@ -4539,6 +4590,13 @@
           "editable": "可编辑",
           "readonly": "唯讀"
         }
+      },
+      "graph_tooltip_options": {
+        "label": {
+          "default": "",
+          "shared-crosshair": "",
+          "shared-tooltip": ""
+        }
       }
     },
     "get-debug-dashboard": {
@@ -4842,6 +4900,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "確定要將儀表板還原到版本{{version}}嗎？所有未儲存變更將會遺失。",
+      "confirmText-restore-version": "",
       "title-restore-version": "還原版本"
     },
     "row-options-button": {
@@ -4892,6 +4951,9 @@
         "title-not-unique": "此標題不是唯一"
       }
     },
+    "save-dashboard": {
+      "message-dashboard-saved": ""
+    },
     "save-dashboard-as-button": {
       "save-as": "另存為"
     },
@@ -4926,6 +4988,7 @@
     "save-dashboard-error-proxy": {
       "body-name-exists": "所選資料夾中已存在名稱相同的儀表板。<1></1><2>仍要儲存此儀表板嗎？</2>",
       "body-version-mismatch": "其他人已更新此儀表板<1></1><2>仍要儲存此儀表板嗎？</2>",
+      "confirmText-save-and-overwrite": "",
       "title-name-exists": "衝突",
       "title-version-mismatch": "衝突"
     },
@@ -5122,7 +5185,9 @@
       "label-apply-transformation-to": "套用轉換至"
     },
     "transformation-operation-row": {
+      "body-delete": "",
       "render-actions": {
+        "confirmText-delete": "",
         "title-debug": "除錯",
         "title-disable-transformation": "停用轉換",
         "title-filter": "篩選",
@@ -5144,10 +5209,14 @@
       "show-images": "顯示圖片",
       "title-add-another-transformation": "新增另一個轉換"
     },
+    "un-theme-transformations-editor": {
+      "body-delete-all-transformations": ""
+    },
     "un-themed-transformations-editor": {
       "actions": {
         "add-another-transformation": "新增另一個轉換"
       },
+      "confirmText-delete-all": "",
       "delete-all-transformations": "刪除所有轉換",
       "title-delete-all-transformations": "是否要刪除所有轉換？",
       "tooltip-clear-search": "清除搜尋",
@@ -5184,6 +5253,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "切換{{version}}版本選擇",
       "date": "日期",
+      "name-latest": "",
       "notes": "備註",
       "restore": "還原",
       "updated-by": "更新者",
@@ -5260,7 +5330,8 @@
       "description-enables-users-custom-values": "使用者能夠將自訂值新增至清單",
       "description-provide-dimensions-as-csv-dimension-name-dimension-id": "以 CSV 格式提供維度：{{name}}，{{value}}",
       "label-data-source": "資料來源",
-      "label-use-static-key-dimensions": "使用靜態金鑰維度"
+      "label-use-static-key-dimensions": "使用靜態金鑰維度",
+      "name-allow-custom-values": ""
     },
     "add-to-dashboard": {
       "message": {
@@ -5333,6 +5404,9 @@
       }
     },
     "config-public-dashboard": {
+      "confirmText": {
+        "revoke-public-url": ""
+      },
       "title": {
         "revoke-public-url": "撤銷公共網址"
       }
@@ -5344,6 +5418,7 @@
     },
     "custom-variable-form": {
       "custom-options": "自訂選項",
+      "name-values-separated-comma": "",
       "selection-options": "選擇選項"
     },
     "dashboard-edit-pane-renderer": {
@@ -5362,6 +5437,12 @@
       "label-type": "類型",
       "label-url": "網址",
       "label-with-tags": "使用標記",
+      "link-type-options": {
+        "label": {
+          "dashboards": "",
+          "link": ""
+        }
+      },
       "placeholder-open-dashboard": "打開儀表板"
     },
     "dashboard-link-list": {
@@ -5408,6 +5489,8 @@
       "data-source-options": "資料來源選項",
       "description-instance-name-filter": "在變數值清單中選擇資料來源執行個體的正規表達式篩選器。全部留空。",
       "example-instance-name-filter": "範例：<codeExample />",
+      "name-instance-name-filter": "",
+      "name-type": "",
       "selection-options": "選擇選項"
     },
     "default-grid-layout-manager": {
@@ -5453,6 +5536,21 @@
     "empty-transformations-message": {
       "add-transformation": "新增轉換"
     },
+    "general-settings-edit-view": {
+      "editable_options": {
+        "label": {
+          "editable": "",
+          "readonly": ""
+        }
+      },
+      "graph_tooltip_options": {
+        "label": {
+          "default": "",
+          "shared-crosshair": "",
+          "shared-tooltip": ""
+        }
+      }
+    },
     "get-edit-options": {
       "title": {
         "column-options": "欄位選項",
@@ -5483,7 +5581,8 @@
       "description-provide-dimensions-as-csv-dimension-name-dimension-id": "以 CSV 格式提供維度：{{name}}，{{value}}",
       "group-by-options": "按選項分組",
       "label-data-source": "資料來源",
-      "label-use-static-group-by-dimensions": "使用靜態群組維度"
+      "label-use-static-group-by-dimensions": "使用靜態群組維度",
+      "name-allow-custom-values": ""
     },
     "help-wizard": {
       "copy-to-clipboard": "複製至剪貼簿",
@@ -5519,9 +5618,14 @@
       "apply": "套用"
     },
     "interval-variable-form": {
+      "description-auto-option": "",
       "description-calculated-value-below-threshold": "計算值不會低於此閾值",
       "description-step-count": "應該將目前的時間範圍除以次數來計算數值",
-      "interval-options": "間隔選項"
+      "interval-options": "間隔選項",
+      "name-auto-option": "",
+      "name-min-interval": "",
+      "name-step-count": "",
+      "name-values": ""
     },
     "json-model-edit-view": {
       "cancel-button": {
@@ -5545,6 +5649,9 @@
       "title-name-already-exists": "名稱已存在"
     },
     "on-open-snapshot-original-dashboard": {
+      "confirmText": {
+        "proceed": ""
+      },
       "title": {
         "proceed-to-external-site": "是否繼續前往外部網站？"
       }
@@ -5580,6 +5687,8 @@
     },
     "panel-data-transformations-tab-rendered": {
       "add-another-transformation": "新增另一個轉換",
+      "body-delete-all-transformations": "",
+      "confirmText-delete-all": "",
       "delete-all-transformations": "刪除所有轉換",
       "title-delete-all-transformations": "是否要刪除所有轉換？"
     },
@@ -5633,6 +5742,7 @@
       "description-optional": "若想擷取系列名稱或指標節點區段的一部分，則為可選。",
       "label-data-source": "資料來源",
       "label-target-data-source": "目標資料來源",
+      "name-regex": "",
       "query-options": "查詢選項",
       "selection-options": "選擇選項"
     },
@@ -5647,6 +5757,7 @@
     },
     "revert-dashboard-modal": {
       "body-restore-version": "確定要將儀表板還原到版本{{version}}嗎？所有未儲存變更將會遺失。",
+      "confirmText-restore-version": "",
       "title-restore-version": "還原版本"
     },
     "save-button": {
@@ -5739,7 +5850,11 @@
     "selection-options-form": {
       "description-enables-multiple-values-selected": "啟用同時選取多個值",
       "description-enables-option-include-variables": "啟用選項以包含所有值",
-      "description-enables-users-custom-values": "使用者能夠將自訂值新增至清單"
+      "description-enables-users-custom-values": "使用者能夠將自訂值新增至清單",
+      "name-allow-custom-values": "",
+      "name-custom-all-value": "",
+      "name-include-all-option": "",
+      "name-multi-value": ""
     },
     "share-button": {
       "aria-label-sharedropdownmenu": "切換分享選單"
@@ -5759,6 +5874,9 @@
         "copy-to-clipboard-failed": "複製到剪貼簿失敗"
       }
     },
+    "text-box-variable": {
+      "name-default-value": ""
+    },
     "text-box-variable-form": {
       "placeholder-default-value-if-any": "（選填）",
       "text-options": "文字選項"
@@ -5782,6 +5900,8 @@
       }
     },
     "unlink-modal": {
+      "body-unlink-panel": "",
+      "confirmText-yes-unlink": "",
       "title-really-unlink-panel": "確定要取消連結此面板嗎？"
     },
     "unsaved-changes-modal": {
@@ -5798,6 +5918,9 @@
         }
       }
     },
+    "use-save-dashboard": {
+      "message-dashboard-saved": ""
+    },
     "variable-check-indicator": {
       "aria-label-variable-referenced-dashboard": "此變數未被任何變數或儀表板參照使用。",
       "aria-label-variable-referenced-other-variables-dashboard": "此變數被其他變數或儀表板參照使用。",
@@ -5807,10 +5930,16 @@
     "variable-editor-form": {
       "aria-label-variable-editor-form": "變數編輯器表單",
       "back-to-list": "返回清單",
+      "confirmText": {
+        "delete-variable": ""
+      },
       "delete": "刪除",
       "description-optional-display-name": "可選的顯示名稱",
       "description-template-variable-characters": "範本變數的名稱。（最多 50 個字元）",
       "general": "一般",
+      "name-description": "",
+      "name-label": "",
+      "name-name": "",
       "placeholder-descriptive-text": "描述性文字",
       "placeholder-label-name": "標籤名稱",
       "placeholder-variable-name": "變數名稱",
@@ -5825,13 +5954,25 @@
       "variable": "變數"
     },
     "variable-editor-list-row": {
+      "body-delete-variable": "",
+      "confirmText-delete-variable": "",
       "title-delete-variable": "刪除變數",
       "tooltip-duplicate-variable": "複製變數",
       "tooltip-remove-variable": "移除變數"
     },
     "variable-hide-select": {
+      "hide_options": {
+        "label": {
+          "label": "",
+          "nothing": "",
+          "variable": ""
+        }
+      },
       "label": "隱藏"
     },
+    "variable-type-select": {
+      "name-variable-type": ""
+    },
     "variable-usages-button": {
       "title-show-usages": "顯示以下項目的使用情況：{{variableId}}",
       "tooltip-show-usages": "顯示使用情況"
@@ -5858,6 +5999,7 @@
     "version-history-table": {
       "aria-label-toggle-selection": "切換{{version}}版本選擇",
       "date": "日期",
+      "name-latest": "",
       "notes": "備註",
       "restore": "還原",
       "updated-by": "更新者",
@@ -6245,7 +6387,8 @@
       }
     },
     "color-dimension-editor": {
-      "label-fixed-color": ""
+      "label-fixed-color": "",
+      "noOptionsMessage-no-fields-found": ""
     },
     "file-dropzone-custom-children": {
       "upload": "上傳"
@@ -6283,6 +6426,7 @@
       },
       "label-limit": "限制",
       "label-value": "數值",
+      "noOptionsMessage-no-fields-found": "",
       "scalar-options": {
         "description-clamped": "",
         "description-mod": "",
@@ -6291,9 +6435,15 @@
       }
     },
     "scale-dimension-editor": {
+      "fixed-value-option": {
+        "label": {
+          "fixed-value": ""
+        }
+      },
       "label-max": "最大",
       "label-min": "最小",
-      "label-value": "數值"
+      "label-value": "數值",
+      "noOptionsMessage-no-fields-found": ""
     },
     "text-dimension-editor": {
       "description-field": "",
@@ -6865,6 +7015,8 @@
       "aria-label-select-service-name-operator": "選取服務名稱運算子",
       "aria-label-select-span-name": "選取範圍名稱",
       "aria-label-select-span-name-operator": "選擇範圍名稱運算子",
+      "ariaLabel-select-max-span-duration": "",
+      "ariaLabel-select-min-span-duration": "",
       "label-collapse": "範圍篩選器",
       "label-duration": "持續時間",
       "label-service-name": "服務名稱",
@@ -6935,6 +7087,8 @@
       "split-widen": "擴大窗格"
     },
     "trace-page-actions": {
+      "ariaLabel-copy-trace-id": "",
+      "ariaLabel-export-trace": "",
       "give-feedback": "提供意見回饋",
       "label-copied": "已複製！",
       "label-export": "匯出",
@@ -7072,6 +7226,7 @@
   },
   "folder-filter": {
     "clear-folder-button": "清除資料夾",
+    "noOptionsMessage-no-folders-found": "",
     "select-aria-label": "資料夾篩選條件",
     "select-placeholder": "按資料夾篩選"
   },
@@ -7140,7 +7295,53 @@
     "incomplete-request-error": "很抱歉，我無法完成您的請求。請再試一次。",
     "send-custom-feedback": "傳送"
   },
+  "geo": {
+    "get-geometry-field": {
+      "warning-gazetteer-not-found": "",
+      "warning-no-geometry": "",
+      "warning-select-geohash": "",
+      "warning-select-lat-long": "",
+      "warning-select-lookup": "",
+      "warning-unable-to-find": ""
+    },
+    "location-editor": {
+      "geohash-field": {
+        "no-fields-message": ""
+      },
+      "latitude-field": {
+        "no-fields-message": ""
+      },
+      "longitude-field": {
+        "no-fields-message": ""
+      },
+      "lookup-field": {
+        "no-fields-message": ""
+      },
+      "name-gazetteer": "",
+      "name-geohash-field": "",
+      "name-latitude-field": "",
+      "name-location-mode": "",
+      "name-longitude-field": "",
+      "name-lookup-field": ""
+    },
+    "location-more-editor": {
+      "mode-options": {
+        "description-auto": "",
+        "description-coords": "",
+        "description-geohash": "",
+        "description-lookup": "",
+        "label-auto": "",
+        "label-coords": "",
+        "label-geohash": "",
+        "label-lookup": ""
+      }
+    }
+  },
   "geomap": {
+    "category-basemap-layer": "",
+    "category-map-controls": "",
+    "category-map-layers": "",
+    "category-map-view": "",
     "coordinates-map-view-editor": {
       "label-latitude": "緯度",
       "label-longitude": "經度"
@@ -7149,6 +7350,14 @@
       "center": "置中：",
       "zoom": "放大："
     },
+    "description-initial-view": "",
+    "description-mouse-wheel-zoom": "",
+    "description-share-view": "",
+    "description-show-attribution": "",
+    "description-show-debug": "",
+    "description-show-measure": "",
+    "description-show-scale": "",
+    "description-show-zoom": "",
     "fit-map-view-editor": {
       "all-layers-editor-fragment": {
         "label-layer": "層次"
@@ -7171,6 +7380,14 @@
     "geomap-style-rules-editor": {
       "aria-label-add-geomap-style-rule": "新增地圖樣式規則"
     },
+    "layer-editor": {
+      "category-base-layer": "",
+      "description-display-tooltip": "",
+      "name-data": "",
+      "name-display-tooltip": "",
+      "name-layer-type": "",
+      "name-opacity": ""
+    },
     "layers-editor": {
       "label-add-layer": "新增圖層",
       "no-layers": "沒有圖層嗎？"
@@ -7181,16 +7398,38 @@
       "label-zoom": "縮放",
       "use-current-map-settings": "使用目前的地圖設定"
     },
+    "markers-layer": {
+      "description-show-legend": "",
+      "name-show-legend": "",
+      "name-styles": ""
+    },
     "markers-legend": {
       "title-symbol": "符號"
     },
     "measure-overlay": {
       "tooltip-show-measure-tools": "顯示測量工具"
     },
+    "name-initial-view": "",
+    "name-mouse-wheel-zoom": "",
+    "name-share-view": "",
+    "name-show-attribution": "",
+    "name-show-debug": "",
+    "name-show-measure": "",
+    "name-show-scale": "",
+    "name-show-zoom": "",
+    "name-tooltip": "",
+    "photos-layer": {
+      "noFieldsMessage-no-string-fields": ""
+    },
     "plugin": {
       "basemap-layer-configured-server-admin": "底圖圖層由伺服器管理員設定。"
     },
     "style-editor": {
+      "horizontal-align-options": {
+        "label-center": "",
+        "label-left": "",
+        "label-right": ""
+      },
       "label-align": "對齊",
       "label-baseline": "基準線",
       "label-color": "顏色",
@@ -7204,7 +7443,14 @@
       "label-symbol-vertical-align": "符號垂直對齊",
       "label-text-label": "文字標籤",
       "label-x-offset": "X 軸偏移",
-      "label-y-offset": "Y 軸偏移"
+      "label-y-offset": "Y 軸偏移",
+      "placeholderText-select-symbol": "",
+      "placeholderText-select-symbol-or-add-text": "",
+      "vertical-align-options": {
+        "label-bottom": "",
+        "label-center": "",
+        "label-top": ""
+      }
     },
     "style-rule-editor": {
       "aria-label-comparison-operator": "比較運算子",
@@ -7215,6 +7461,15 @@
       "placeholder-feature-property": "功能屬性",
       "placeholder-numeric-value": "數值",
       "placeholder-value": "值"
+    },
+    "tooltip-options": {
+      "description-details": "",
+      "description-none": "",
+      "label-details": "",
+      "label-none": ""
+    },
+    "utils": {
+      "get-next-layer-name": ""
     }
   },
   "get-enterprise": {
@@ -7464,7 +7719,8 @@
       "aria-label-selected-color": "{{colorLabel}} 顏色"
     },
     "confirm-button": {
-      "cancel": "取消"
+      "cancel": "取消",
+      "confirmText-delete": ""
     },
     "confirm-content": {
       "placeholder": "輸入「{{confirmPromptText}}」以確認"
@@ -7646,6 +7902,8 @@
     },
     "panel-chrome": {
       "aria-label-toggle-collapse": "切換收闔面板",
+      "ariaLabel-panel-loading": "",
+      "ariaLabel-panel-status": "",
       "tooltip-cancel": "取消查詢",
       "tooltip-cancel-loading": "取消查詢",
       "tooltip-stop-streaming": "停止串流",
@@ -7813,6 +8071,12 @@
       "footer-click-to-action": "點選以{{actionTitle}}",
       "footer-click-to-navigate": "點選以開啟「{{linkTitle}}」",
       "timestamp": "時間戳記"
+    },
+    "week-start-picker": {
+      "weekStarts-label-default": "",
+      "weekStarts-label-monday": "",
+      "weekStarts-label-saturday": "",
+      "weekStarts-label-sunday": ""
     }
   },
   "graph": {
@@ -8189,6 +8453,10 @@
     "add-library-panel-modal": {
       "title-create-library-panel": "建立資料庫面板"
     },
+    "change-library-panel-modal": {
+      "confirmText-change": "",
+      "confirmText-replace": ""
+    },
     "confirm": {
       "delete-panel": "要刪除此面板嗎？"
     },
@@ -8630,6 +8898,8 @@
       "updated-on": "更新日期"
     },
     "snapshot-list-table": {
+      "body-delete": "",
+      "confirmText-delete": "",
       "title-delete": "刪除"
     },
     "unthemed-dashboard-import": {
@@ -8641,6 +8911,9 @@
       }
     }
   },
+  "metric-select": {
+    "noOptionsMessage-no-options-found": ""
+  },
   "migrate-to-cloud": {
     "build-snapshot": {
       "description": "此工具可以將某些資源從此安裝移轉至您的雲端堆疊。若要開始，您需要建立此安裝的快照。建立快照通常只需不到兩分鐘。快照與此 Grafana 安裝一起儲存。",
@@ -9476,6 +9749,7 @@
     }
   },
   "org-picker": {
+    "noOptionsMessage-no-organizations-found": "",
     "select-placeholder": "選取組織"
   },
   "page": {
@@ -9698,6 +9972,7 @@
         "permission": "您沒有查看此頁面的權限。",
         "title-access-denied": "拒絕存取"
       },
+      "error-loading-plugin": "",
       "no-root-app-page-component-found": "找不到根應用程式頁面元件"
     },
     "browse": {
@@ -9741,8 +10016,7 @@
         "update-status-text": "外掛程式已更新"
       },
       "versions": {
-        "confirmation-text-1": "您確定要降級至版本嗎",
-        "confirmation-text-2": "通常不應這麼做",
+        "confirmation-text": "",
         "downgrade-confirm": "降級",
         "downgrade-title": "降級外掛程式版本"
       }
@@ -9796,6 +10070,10 @@
     "empty-state": {
       "message": "未找到外掛程式"
     },
+    "extensions": {
+      "extension-error-alert-description": "",
+      "extension-error-alert-title": ""
+    },
     "extensions-log-data-source": {
       "message": {
         "ok": "確定"
@@ -9829,7 +10107,11 @@
       "updating": "更新中"
     },
     "install-controls-button": {
-      "title-uninstall-modal": "解除安裝 {{plugin}}"
+      "title-uninstall-modal": "解除安裝 {{plugin}}",
+      "uninstall-controls": {
+        "body-uninstall-plugin": "",
+        "confirmText-confirm": ""
+      }
     },
     "install-controls-warning": {
       "body-not-published": "此外掛程式未發佈到 <2>grafana.com/plugins</2>，無法透過目錄管理。",
@@ -10860,6 +11142,7 @@
     }
   },
   "service-account-picker": {
+    "noOptionsMessage-no-service-accounts-found": "",
     "select-aria-label": "服務帳戶選擇器",
     "select-placeholder": "開始輸入以搜尋服務帳戶"
   },
@@ -10905,6 +11188,10 @@
     },
     "service-account-page-unconnected": {
       "add-service-account-token": "新增服務帳戶權杖",
+      "body-delete-service-account": "",
+      "body-disable-service-account": "",
+      "confirmText-delete-service-account": "",
+      "confirmText-disable-service-account": "",
       "delete-service-account": "刪除服務帳戶",
       "disable-service-account": "停用服務帳戶",
       "enable-service-account": "啟用服務帳戶",
@@ -10931,6 +11218,7 @@
       "used-by": "使用者"
     },
     "service-account-profile-row": {
+      "confirmText-save": "",
       "edit": "編輯"
     },
     "service-account-role-row": {
@@ -10944,10 +11232,15 @@
     },
     "service-accounts-list-page-unconnected": {
       "add-service-account": "新增服務帳戶",
+      "body-delete-with-tokens": "",
+      "body-disable-service-account": "",
+      "confirmText-delete": "",
+      "confirmText-disable-service-account": "",
       "placeholder-search-service-account-by-name": "按名稱搜尋服務帳戶",
       "sub-title": "服務帳戶及其權杖可用於針對 Grafana API 進行驗證。請在我們的<2>文件中閱讀更多資訊。</2>",
       "title-delete-service-account": "刪除服務帳戶",
-      "title-disable-service-account": "停用服務帳戶"
+      "title-disable-service-account": "停用服務帳戶",
+      "body-delete_other": ""
     },
     "token-expiration": {
       "content-this-token-has-expired": "此權杖已過期",
@@ -11483,6 +11776,7 @@
     "tag-option-label": "標記選項"
   },
   "team-picker": {
+    "noOptionsMessage-no-teams-found": "",
     "select-aria-label": "團隊選擇器",
     "select-placeholder": "選擇團隊"
   },
@@ -11808,6 +12102,7 @@
     "convert-field-type-transformer-editor": {
       "aria-label-add-a-convert-field-type-transformer": "新增轉換欄位類型轉換器",
       "aria-label-remove-convert-field-type-transformer": "移除轉換欄位類型轉換器",
+      "convert-field-type": "",
       "label": {
         "browser": "瀏覽器",
         "utc": "UTC"
@@ -11850,6 +12145,11 @@
       "remove-enum-row-tooltip-delete": "刪除"
     },
     "extract-fields-transformer-editor": {
+      "field-name-picker-settings": {
+        "placeholderText": {
+          "select-field": ""
+        }
+      },
       "label-delimiter": "定界符",
       "label-format": "格式",
       "label-keep-time": "保持時間",
@@ -11863,6 +12163,14 @@
       "aria-label-threshold-color": "閾值顏色"
     },
     "field-lookup-transformer-editor": {
+      "field-name-picker-settings": {
+        "noFieldsMessage": {
+          "no-text-fields-found": ""
+        },
+        "placeholderText": {
+          "select-text-field": ""
+        }
+      },
       "label-field": "欄位",
       "label-lookup": "查找"
     },
@@ -11888,10 +12196,30 @@
     },
     "filter-by-value-transformer-editor": {
       "add-condition": "新增條件",
+      "filter-match": {
+        "label": {
+          "match-all": "",
+          "match-any": ""
+        }
+      },
+      "filter-types": {
+        "label": {
+          "exclude": "",
+          "include": ""
+        }
+      },
       "label-conditions": "條件",
       "label-filter-type": "篩選器類型"
     },
     "format-string-transfomer-editor": {
+      "field-name-picker-settings": {
+        "noFieldsMessage": {
+          "no-text-fields-found": ""
+        },
+        "placeholderText": {
+          "select-text-field": ""
+        }
+      },
       "label-field": "欄位",
       "label-format": "格式",
       "label-substring-range": "子字串範圍"
@@ -12202,6 +12530,7 @@
     "title": "組織"
   },
   "user-picker": {
+    "noOptionsMessage-no-users-found": "",
     "select-aria-label": "使用者選擇器",
     "select-placeholder": "開始輸入以搜尋使用者"
   },
@@ -12287,6 +12616,8 @@
       }
     },
     "confirm-delete-modal": {
+      "body-delete-variable": "",
+      "confirmText-delete": "",
       "title-delete-variable": "刪除變數"
     },
     "create-ad-hoc-variable-adapter": {
@@ -12335,9 +12666,24 @@
       "label-refresh": "重新整理"
     },
     "query-variable-sort-select": {
-      "description-values-variable": "如何將此變數的值排序"
+      "description-values-variable": "如何將此變數的值排序",
+      "name-sort": "",
+      "sort_options": {
+        "label": {
+          "alphabetical-asc": "",
+          "alphabetical-caseinsensitive-asc": "",
+          "alphabetical-caseinsensitive-desc": "",
+          "alphabetical-desc": "",
+          "disabled": "",
+          "natural-asc": "",
+          "natural-desc": "",
+          "numerical-asc": "",
+          "numerical-desc": ""
+        }
+      }
     },
     "text-box-variable-editor": {
+      "name-default-value": "",
       "placeholder-default-value-if-any": "預設值（如有）",
       "text-options": "文字選項"
     },
@@ -12366,6 +12712,8 @@
       "description-optional-display-name": "可選的顯示名稱",
       "description-template-variable-characters": "範本變數的名稱。（最多 50 個字元）",
       "general": "一般",
+      "name-label": "",
+      "name-name": "",
       "placeholder-descriptive-text": "描述性文字",
       "placeholder-label-name": "標籤名稱",
       "placeholder-variable-name": "變數名稱",
@@ -12380,9 +12728,15 @@
       "tooltip-duplicate-variable": "複製變數",
       "tooltip-remove-variable": "移除變數"
     },
+    "variable-editor-un-connected": {
+      "name-description": ""
+    },
     "variable-options": {
       "aria-label-toggle-all-values": "切換所有值"
     },
+    "variable-type-select": {
+      "name-select-variable-type": ""
+    },
     "variable-usages-button": {
       "tooltip-show-usages": "顯示使用情況"
     },

From 285c69c4879cdb6ac9268fdbaa3f2884df199eed Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 8 Jul 2025 10:53:50 +0000
Subject: [PATCH 06/21] Update dependency react-calendar to v6 (#107726)

* Update dependency react-calendar to v6

* add esmodules to jest config

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
---
 jest.config.js                   |  5 ++++
 packages/grafana-ui/package.json |  2 +-
 yarn.lock                        | 41 +++++++++++++++++++++++++-------
 3 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/jest.config.js b/jest.config.js
index 60d5a141652..0882834ab48 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -5,17 +5,22 @@ process.env.TZ = 'Pacific/Easter'; // UTC-06:00 or UTC-05:00 depending on daylig
 
 const esModules = [
   '@glideapps/glide-data-grid',
+  '@wojtekmaj/date-utils',
   'ol',
   'd3',
   'd3-color',
   'd3-interpolate',
   'delaunator',
+  'get-user-locale',
   'internmap',
   'robust-predicates',
   'leven',
   'nanoid',
   'marked',
+  'memoize',
+  'mimic-function',
   'monaco-promql',
+  'react-calendar',
   '@kusto/monaco-kusto',
   'monaco-editor',
   '@msagl',
diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json
index 9dface55147..9c59995e664 100644
--- a/packages/grafana-ui/package.json
+++ b/packages/grafana-ui/package.json
@@ -104,7 +104,7 @@
     "rc-picker": "4.11.3",
     "rc-slider": "11.1.8",
     "rc-tooltip": "6.4.0",
-    "react-calendar": "^5.1.0",
+    "react-calendar": "^6.0.0",
     "react-colorful": "5.6.1",
     "react-custom-scrollbars-2": "4.5.0",
     "react-data-grid": "grafana/react-data-grid#de920f0105cb2b7d774444e7443a675f3b568ad6",
diff --git a/yarn.lock b/yarn.lock
index 4527dcfdf6d..88eb9b9d347 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3772,7 +3772,7 @@ __metadata:
     rc-slider: "npm:11.1.8"
     rc-tooltip: "npm:6.4.0"
     react: "npm:18.3.1"
-    react-calendar: "npm:^5.1.0"
+    react-calendar: "npm:^6.0.0"
     react-colorful: "npm:5.6.1"
     react-custom-scrollbars-2: "npm:4.5.0"
     react-data-grid: "grafana/react-data-grid#de920f0105cb2b7d774444e7443a675f3b568ad6"
@@ -10913,6 +10913,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@wojtekmaj/date-utils@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "@wojtekmaj/date-utils@npm:2.0.2"
+  checksum: 10/46256ee404952b3f99e6388ce832f2caf8d20c0b5086227de93ae6d3045cfe2aa56f3b07984350139cde00aa35794516ed1223b7ae997047c42b9403e25ca19e
+  languageName: node
+  linkType: hard
+
 "@xobotyi/scrollbar-width@npm:^1.9.5":
   version: 1.9.5
   resolution: "@xobotyi/scrollbar-width@npm:1.9.5"
@@ -17707,6 +17714,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"get-user-locale@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "get-user-locale@npm:3.0.0"
+  dependencies:
+    memoize: "npm:^10.0.0"
+  checksum: 10/b95ce2cc9105d81d57acc75930f1a965be273d694b10ce2d6b0fc7e7aee616dc947ed69c71ec0059823fabaf036b8145501a7ec08af68558df5a123bc0401013
+  languageName: node
+  linkType: hard
+
 "get-window@npm:^1.1.1":
   version: 1.1.2
   resolution: "get-window@npm:1.1.2"
@@ -22526,6 +22542,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"memoize@npm:^10.0.0":
+  version: 10.1.0
+  resolution: "memoize@npm:10.1.0"
+  dependencies:
+    mimic-function: "npm:^5.0.1"
+  checksum: 10/77ac790f6f9ffa6dc666e5e47cf145106aacfec01a53e33738952f516914550813b864cd98f353233f871e1f0331195f5c8d1698ea0bdbdc978d7c171c8c167e
+  languageName: node
+  linkType: hard
+
 "memoizerific@npm:^1.11.3":
   version: 1.11.3
   resolution: "memoizerific@npm:1.11.3"
@@ -22670,7 +22695,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mimic-function@npm:^5.0.0":
+"mimic-function@npm:^5.0.0, mimic-function@npm:^5.0.1":
   version: 5.0.1
   resolution: "mimic-function@npm:5.0.1"
   checksum: 10/eb5893c99e902ccebbc267c6c6b83092966af84682957f79313311edb95e8bb5f39fb048d77132b700474d1c86d90ccc211e99bae0935447a4834eb4c882982c
@@ -26504,13 +26529,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-calendar@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "react-calendar@npm:5.1.0"
+"react-calendar@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "react-calendar@npm:6.0.0"
   dependencies:
-    "@wojtekmaj/date-utils": "npm:^1.1.3"
+    "@wojtekmaj/date-utils": "npm:^2.0.2"
     clsx: "npm:^2.0.0"
-    get-user-locale: "npm:^2.2.1"
+    get-user-locale: "npm:^3.0.0"
     warning: "npm:^4.0.0"
   peerDependencies:
     "@types/react": ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
@@ -26519,7 +26544,7 @@ __metadata:
   peerDependenciesMeta:
     "@types/react":
       optional: true
-  checksum: 10/69c5f809646edae64dc75d8709ccac979723fde2d5752f0992e429d09a1caf45e6c2d340563dfec2cf27e22a19b5f51f65c05decfcae9860c34470c08261de43
+  checksum: 10/ba555e280a829b84a9675636c3166ef728cb40f200cdf31696fe4f45e09a39fd73594b764e5b2793c35414e96101c472332507e5bb42e5e182d43a85b060de40
   languageName: node
   linkType: hard
 

From 365234c2fe856c8f669f773955e74f8da89edda0 Mon Sep 17 00:00:00 2001
From: Dominik Prokop <dominik.prokop@grafana.com>
Date: Tue, 8 Jul 2025 13:11:25 +0200
Subject: [PATCH 07/21] PublicDashboards: Use API to render public dashboard
 badge (#107638)

* PublicDashboards: Use API to render public dashboard badge

* i18n

* Keine console bitte

* Update public/app/features/dashboard-scene/scene/NavToolbarActions.tsx

* Update tests
---
 .../scene/NavToolbarActions.tsx               | 37 +++++--------------
 .../scene/new-toolbar/LeftActions.tsx         |  3 +-
 .../actions/PublicDashboardBadge.tsx          | 26 ++++++++++++-
 .../dashboard/components/DashNav/DashNav.tsx  | 24 +-----------
 public/locales/en-US/grafana.json             |  2 -
 5 files changed, 36 insertions(+), 56 deletions(-)

diff --git a/public/app/features/dashboard-scene/scene/NavToolbarActions.tsx b/public/app/features/dashboard-scene/scene/NavToolbarActions.tsx
index 77113ff1b2b..2e36a248586 100644
--- a/public/app/features/dashboard-scene/scene/NavToolbarActions.tsx
+++ b/public/app/features/dashboard-scene/scene/NavToolbarActions.tsx
@@ -5,17 +5,7 @@ import { GrafanaTheme2, store } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 import { Trans, t } from '@grafana/i18n';
 import { config, locationService } from '@grafana/runtime';
-import {
-  Badge,
-  Button,
-  ButtonGroup,
-  Dropdown,
-  Icon,
-  Menu,
-  ToolbarButton,
-  ToolbarButtonRow,
-  useStyles2,
-} from '@grafana/ui';
+import { Button, ButtonGroup, Dropdown, Icon, Menu, ToolbarButton, ToolbarButtonRow, useStyles2 } from '@grafana/ui';
 import { AppChromeUpdate } from 'app/core/components/AppChrome/AppChromeUpdate';
 import { NavToolbarSeparator } from 'app/core/components/AppChrome/NavToolbar/NavToolbarSeparator';
 import grafanaConfig from 'app/core/config';
@@ -39,6 +29,7 @@ import { GoToSnapshotOriginButton } from './GoToSnapshotOriginButton';
 import ManagedDashboardNavBarBadge from './ManagedDashboardNavBarBadge';
 import { LeftActions } from './new-toolbar/LeftActions';
 import { RightActions } from './new-toolbar/RightActions';
+import { PublicDashboardBadge } from './new-toolbar/actions/PublicDashboardBadge';
 
 interface Props {
   dashboard: DashboardScene;
@@ -119,23 +110,13 @@ export function ToolbarActions({ dashboard }: Props) {
     },
   });
 
-  if (meta.publicDashboardEnabled) {
-    toolbarActions.push({
-      group: 'icon-actions',
-      condition: uid && Boolean(meta.canStar) && isShowingDashboard && !isEditing,
-      render: () => {
-        return (
-          <Badge
-            color="blue"
-            text={t('dashboard.toolbar.public-dashboard', 'Public')}
-            key="public-dashboard-button-badge"
-            className={styles.publicBadge}
-            data-testid={selectors.pages.Dashboard.DashNav.publicDashboardTag}
-          />
-        );
-      },
-    });
-  }
+  toolbarActions.push({
+    group: 'icon-actions',
+    condition: uid && Boolean(meta.canStar) && isShowingDashboard && !isEditing,
+    render: () => {
+      return <PublicDashboardBadge key="public-dashboard-badge" dashboard={dashboard} />;
+    },
+  });
 
   if (dashboard.isManaged() && meta.canEdit) {
     toolbarActions.push({
diff --git a/public/app/features/dashboard-scene/scene/new-toolbar/LeftActions.tsx b/public/app/features/dashboard-scene/scene/new-toolbar/LeftActions.tsx
index ec37d446145..6f7f361caf6 100644
--- a/public/app/features/dashboard-scene/scene/new-toolbar/LeftActions.tsx
+++ b/public/app/features/dashboard-scene/scene/new-toolbar/LeftActions.tsx
@@ -16,7 +16,6 @@ export const LeftActions = ({ dashboard }: { dashboard: DashboardScene }) => {
   const isViewingPanel = Boolean(viewPanelScene);
   const isEditingDashboard = Boolean(isEditing);
   const isEditingPanel = Boolean(editPanel);
-  const isPublicDashboard = Boolean(meta.publicDashboardEnabled);
   const hasUid = Boolean(uid);
   const canEdit = Boolean(meta.canEdit);
   const canStar = Boolean(meta.canStar);
@@ -37,7 +36,7 @@ export const LeftActions = ({ dashboard }: { dashboard: DashboardScene }) => {
         key: 'public-dashboard-badge',
         component: PublicDashboardBadge,
         group: 'actions',
-        condition: isPublicDashboard && hasUid && canStar && isShowingDashboard && !isEditingDashboard,
+        condition: hasUid && canStar && isShowingDashboard && !isEditingDashboard,
       },
       {
         key: 'managed-dashboard-badge',
diff --git a/public/app/features/dashboard-scene/scene/new-toolbar/actions/PublicDashboardBadge.tsx b/public/app/features/dashboard-scene/scene/new-toolbar/actions/PublicDashboardBadge.tsx
index 46cbebda4fd..9cab7a7ab2a 100644
--- a/public/app/features/dashboard-scene/scene/new-toolbar/actions/PublicDashboardBadge.tsx
+++ b/public/app/features/dashboard-scene/scene/new-toolbar/actions/PublicDashboardBadge.tsx
@@ -3,10 +3,32 @@ import { css } from '@emotion/css';
 import { selectors } from '@grafana/e2e-selectors';
 import { t } from '@grafana/i18n';
 import { Badge, useStyles2 } from '@grafana/ui';
+import { useGetPublicDashboardQuery } from 'app/features/dashboard/api/publicDashboardApi';
 
 import { ToolbarActionProps } from '../types';
 
-export const PublicDashboardBadge = ({}: ToolbarActionProps) => {
+export const PublicDashboardBadge = ({ dashboard }: ToolbarActionProps) => {
+  if (!dashboard.state.uid) {
+    return null;
+  }
+
+  return <PublicDashboardBadgeInternal uid={dashboard.state.uid} />;
+};
+
+// Used in old architecture
+export const PublicDashboardBadgeLegacy = PublicDashboardBadgeInternal;
+
+function PublicDashboardBadgeInternal({ uid }: { uid?: string }) {
+  if (!uid) {
+    return null;
+  }
+
+  const { data: publicDashboard } = useGetPublicDashboardQuery(uid);
+
+  if (!publicDashboard) {
+    return null;
+  }
+
   const styles = useStyles2(getStyles);
 
   return (
@@ -17,7 +39,7 @@ export const PublicDashboardBadge = ({}: ToolbarActionProps) => {
       data-testid={selectors.pages.Dashboard.DashNav.publicDashboardTag}
     />
   );
-};
+}
 
 const getStyles = () => ({
   badge: css({
diff --git a/public/app/features/dashboard/components/DashNav/DashNav.tsx b/public/app/features/dashboard/components/DashNav/DashNav.tsx
index b4a6e81d6cd..0999d86780e 100644
--- a/public/app/features/dashboard/components/DashNav/DashNav.tsx
+++ b/public/app/features/dashboard/components/DashNav/DashNav.tsx
@@ -4,7 +4,6 @@ import { connect, ConnectedProps } from 'react-redux';
 import { useLocation } from 'react-router-dom-v5-compat';
 
 import { textUtil } from '@grafana/data';
-import { selectors as e2eSelectors } from '@grafana/e2e-selectors/src';
 import { Trans, t } from '@grafana/i18n';
 import { locationService } from '@grafana/runtime';
 import {
@@ -14,7 +13,6 @@ import {
   useForceUpdate,
   ToolbarButtonRow,
   ConfirmModal,
-  Badge,
 } from '@grafana/ui';
 import { updateNavIndex } from 'app/core/actions';
 import { AppChromeUpdate } from 'app/core/components/AppChrome/AppChromeUpdate';
@@ -29,6 +27,7 @@ import AddPanelButton from 'app/features/dashboard/components/AddPanelButton/Add
 import { SaveDashboardDrawer } from 'app/features/dashboard/components/SaveDashboard/SaveDashboardDrawer';
 import { getDashboardSrv } from 'app/features/dashboard/services/DashboardSrv';
 import { DashboardModel } from 'app/features/dashboard/state/DashboardModel';
+import { PublicDashboardBadgeLegacy } from 'app/features/dashboard-scene/scene/new-toolbar/actions/PublicDashboardBadge';
 import { DashboardInteractions } from 'app/features/dashboard-scene/utils/interactions';
 import { playlistSrv } from 'app/features/playlist/PlaylistSrv';
 import { updateTimeZoneForSession } from 'app/features/profile/state/reducers';
@@ -58,8 +57,6 @@ const mapStateToProps = (state: StoreState) => ({
 
 const connector = connect(mapStateToProps, mapDispatchToProps);
 
-const selectors = e2eSelectors.pages.Dashboard.DashNav;
-
 export interface OwnProps {
   dashboard: DashboardModel;
   isFullscreen: boolean;
@@ -215,18 +212,7 @@ export const DashNav = memo<Props>((props) => {
       );
     }
 
-    if (dashboard.meta.publicDashboardEnabled) {
-      // TODO: This will be replaced with the new badge component. Color is required but gets override by css
-      buttons.push(
-        <Badge
-          color="blue"
-          text={t('dashboard.dash-nav.render-left-actions.text-public', 'Public')}
-          key="public-dashboard-button-badge"
-          className={publicBadgeStyle}
-          data-testid={selectors.publicDashboardTag}
-        />
-      );
-    }
+    buttons.push(<PublicDashboardBadgeLegacy key="public-dashboard-badge" uid={dashboard.uid} />);
 
     if (isDevEnv && config.featureToggles.dashboardScene) {
       buttons.push(
@@ -377,9 +363,3 @@ const modalStyles = css({
   width: 'max-content',
   maxWidth: '80vw',
 });
-
-const publicBadgeStyle = css({
-  color: 'grey',
-  backgroundColor: 'transparent',
-  border: '1px solid',
-});
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index 197750619cf..ff317b5d624 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -4399,7 +4399,6 @@
         }
       },
       "render-left-actions": {
-        "text-public": "Public",
         "tooltip-view-as-scene": "View as Scene"
       }
     },
@@ -5173,7 +5172,6 @@
       "playlist-next": "Go to next dashboard",
       "playlist-previous": "Go to previous dashboard",
       "playlist-stop": "Stop playlist",
-      "public-dashboard": "Public",
       "refresh": "Refresh dashboard",
       "save": "Save dashboard",
       "save-dashboard": {

From 2de7f424f59d006cd3f8b97895ac23abb63a3fb7 Mon Sep 17 00:00:00 2001
From: Yunwen Zheng <yunwen.zheng@grafana.com>
Date: Tue, 8 Jul 2025 07:24:16 -0400
Subject: [PATCH 08/21] BrowseDashboardsPage: added new pull request banner on
 new folder creation (#107596)

* BrowseDashboardsPage: added ProvisionedFolderPreviewBanner to display new provisioned folder on branch alert

* add comment

* fix test

* i18n

* Added test for PreviewBannerViewPR

* fix test, i18n fix
---
 .../BrowseDashboardsPage.test.tsx             |  44 +++---
 .../BrowseDashboardsPage.tsx                  |   4 +-
 .../NewProvisionedFolderForm.test.tsx         |   4 +-
 .../components/NewProvisionedFolderForm.tsx   |   2 +-
 .../ProvisionedFolderPreviewBanner.tsx        |  23 ++++
 .../provisioned/DashboardPreviewBanner.tsx    |  59 ++-------
 .../provisioned/PreviewBannerViewPR.test.tsx  | 125 ++++++++++++++++++
 .../provisioned/PreviewBannerViewPR.tsx       |  64 +++++++++
 .../provisioning/hooks/usePullRequestParam.ts |  10 +-
 public/locales/en-US/grafana.json             |  19 ++-
 10 files changed, 266 insertions(+), 88 deletions(-)
 create mode 100644 public/app/features/browse-dashboards/components/ProvisionedFolderPreviewBanner.tsx
 create mode 100644 public/app/features/dashboard-scene/saving/provisioned/PreviewBannerViewPR.test.tsx
 create mode 100644 public/app/features/dashboard-scene/saving/provisioned/PreviewBannerViewPR.tsx

diff --git a/public/app/features/browse-dashboards/BrowseDashboardsPage.test.tsx b/public/app/features/browse-dashboards/BrowseDashboardsPage.test.tsx
index 36182de2d44..a2bfe9ca651 100644
--- a/public/app/features/browse-dashboards/BrowseDashboardsPage.test.tsx
+++ b/public/app/features/browse-dashboards/BrowseDashboardsPage.test.tsx
@@ -163,17 +163,17 @@ describe('browse-dashboards BrowseDashboardsPage', () => {
 
   describe('at the root level', () => {
     it('displays "Dashboards" as the page title', async () => {
-      render(<BrowseDashboardsPage />);
+      render(<BrowseDashboardsPage queryParams={{}} />);
       expect(await screen.findByRole('heading', { name: 'Dashboards' })).toBeInTheDocument();
     });
 
     it('displays a search input', async () => {
-      render(<BrowseDashboardsPage />);
+      render(<BrowseDashboardsPage queryParams={{}} />);
       expect(await screen.findByPlaceholderText('Search for dashboards and folders')).toBeInTheDocument();
     });
 
     it('shows the "New" button', async () => {
-      render(<BrowseDashboardsPage />);
+      render(<BrowseDashboardsPage queryParams={{}} />);
       expect(await screen.findByRole('button', { name: 'New' })).toBeInTheDocument();
     });
 
@@ -185,25 +185,25 @@ describe('browse-dashboards BrowseDashboardsPage', () => {
           canCreateFolders: false,
         };
       });
-      render(<BrowseDashboardsPage />);
+      render(<BrowseDashboardsPage queryParams={{}} />);
       expect(await screen.findByRole('heading', { name: 'Dashboards' })).toBeInTheDocument();
       expect(screen.queryByRole('button', { name: 'New' })).not.toBeInTheDocument();
     });
 
     it('does not show "Folder actions"', async () => {
-      render(<BrowseDashboardsPage />);
+      render(<BrowseDashboardsPage queryParams={{}} />);
       expect(await screen.findByRole('heading', { name: 'Dashboards' })).toBeInTheDocument();
       expect(screen.queryByRole('button', { name: 'Folder actions' })).not.toBeInTheDocument();
     });
 
     it('does not show an "Edit title" button', async () => {
-      render(<BrowseDashboardsPage />);
+      render(<BrowseDashboardsPage queryParams={{}} />);
       expect(await screen.findByRole('heading', { name: 'Dashboards' })).toBeInTheDocument();
       expect(screen.queryByRole('button', { name: 'Edit title' })).not.toBeInTheDocument();
     });
 
     it('does not show any tabs', async () => {
-      render(<BrowseDashboardsPage />);
+      render(<BrowseDashboardsPage queryParams={{}} />);
       expect(await screen.findByRole('heading', { name: 'Dashboards' })).toBeInTheDocument();
 
       expect(screen.queryByRole('tab', { name: 'Dashboards' })).not.toBeInTheDocument();
@@ -212,7 +212,7 @@ describe('browse-dashboards BrowseDashboardsPage', () => {
     });
 
     it('displays the filters and hides the actions initially', async () => {
-      render(<BrowseDashboardsPage />);
+      render(<BrowseDashboardsPage queryParams={{}} />);
       await screen.findByPlaceholderText('Search for dashboards and folders');
 
       expect(await screen.findByText('Sort')).toBeInTheDocument();
@@ -223,7 +223,7 @@ describe('browse-dashboards BrowseDashboardsPage', () => {
     });
 
     it('selecting an item hides the filters and shows the actions instead', async () => {
-      render(<BrowseDashboardsPage />);
+      render(<BrowseDashboardsPage queryParams={{}} />);
 
       const checkbox = await screen.findByTestId(selectors.pages.BrowseDashboards.table.checkbox(dashbdD.item.uid));
       await userEvent.click(checkbox);
@@ -238,7 +238,7 @@ describe('browse-dashboards BrowseDashboardsPage', () => {
     });
 
     it('navigating into a child item resets the selected state', async () => {
-      const { rerender } = render(<BrowseDashboardsPage />);
+      const { rerender } = render(<BrowseDashboardsPage queryParams={{}} />);
 
       const checkbox = await screen.findByTestId(selectors.pages.BrowseDashboards.table.checkbox(folderA.item.uid));
       await userEvent.click(checkbox);
@@ -248,7 +248,7 @@ describe('browse-dashboards BrowseDashboardsPage', () => {
       expect(screen.getByRole('button', { name: 'Delete' })).toBeInTheDocument();
 
       (useParams as jest.Mock).mockReturnValue({ uid: folderA.item.uid });
-      rerender(<BrowseDashboardsPage />);
+      rerender(<BrowseDashboardsPage queryParams={{}} />);
 
       // Check the filters are now visible again
       expect(await screen.findByText('Filter by tag')).toBeInTheDocument();
@@ -266,17 +266,17 @@ describe('browse-dashboards BrowseDashboardsPage', () => {
     });
 
     it('shows the folder name as the page title', async () => {
-      render(<BrowseDashboardsPage />);
+      render(<BrowseDashboardsPage queryParams={{}} />);
       expect(await screen.findByRole('heading', { name: folderA.item.title })).toBeInTheDocument();
     });
 
     it('displays a search input', async () => {
-      render(<BrowseDashboardsPage />);
+      render(<BrowseDashboardsPage queryParams={{}} />);
       expect(await screen.findByPlaceholderText('Search for dashboards and folders')).toBeInTheDocument();
     });
 
     it('shows the "New" button', async () => {
-      render(<BrowseDashboardsPage />);
+      render(<BrowseDashboardsPage queryParams={{}} />);
       expect(await screen.findByRole('button', { name: 'New' })).toBeInTheDocument();
     });
 
@@ -288,13 +288,13 @@ describe('browse-dashboards BrowseDashboardsPage', () => {
           canCreateFolders: false,
         };
       });
-      render(<BrowseDashboardsPage />);
+      render(<BrowseDashboardsPage queryParams={{}} />);
       expect(await screen.findByRole('heading', { name: folderA.item.title })).toBeInTheDocument();
       expect(screen.queryByRole('button', { name: 'New' })).not.toBeInTheDocument();
     });
 
     it('shows the "Folder actions" button', async () => {
-      render(<BrowseDashboardsPage />);
+      render(<BrowseDashboardsPage queryParams={{}} />);
       expect(await screen.findByRole('button', { name: 'Folder actions' })).toBeInTheDocument();
     });
 
@@ -308,13 +308,13 @@ describe('browse-dashboards BrowseDashboardsPage', () => {
           canViewPermissions: false,
         };
       });
-      render(<BrowseDashboardsPage />);
+      render(<BrowseDashboardsPage queryParams={{}} />);
       expect(await screen.findByRole('heading', { name: folderA.item.title })).toBeInTheDocument();
       expect(screen.queryByRole('button', { name: 'Folder actions' })).not.toBeInTheDocument();
     });
 
     it('shows an "Edit title" button', async () => {
-      render(<BrowseDashboardsPage />);
+      render(<BrowseDashboardsPage queryParams={{}} />);
       expect(await screen.findByRole('button', { name: 'Edit title' })).toBeInTheDocument();
     });
 
@@ -325,13 +325,13 @@ describe('browse-dashboards BrowseDashboardsPage', () => {
           canEditFolders: false,
         };
       });
-      render(<BrowseDashboardsPage />);
+      render(<BrowseDashboardsPage queryParams={{}} />);
       expect(await screen.findByRole('heading', { name: folderA.item.title })).toBeInTheDocument();
       expect(screen.queryByRole('button', { name: 'Edit title' })).not.toBeInTheDocument();
     });
 
     it('displays all the folder tabs and shows the "Dashboards" tab as selected', async () => {
-      render(<BrowseDashboardsPage />);
+      render(<BrowseDashboardsPage queryParams={{}} />);
       expect(await screen.findByRole('tab', { name: 'Dashboards' })).toBeInTheDocument();
       expect(await screen.findByRole('tab', { name: 'Dashboards' })).toHaveAttribute('aria-selected', 'true');
 
@@ -343,7 +343,7 @@ describe('browse-dashboards BrowseDashboardsPage', () => {
     });
 
     it('displays the filters and hides the actions initially', async () => {
-      render(<BrowseDashboardsPage />);
+      render(<BrowseDashboardsPage queryParams={{}} />);
       await screen.findByPlaceholderText('Search for dashboards and folders');
 
       expect(await screen.findByText('Sort')).toBeInTheDocument();
@@ -354,7 +354,7 @@ describe('browse-dashboards BrowseDashboardsPage', () => {
     });
 
     it('selecting an item hides the filters and shows the actions instead', async () => {
-      render(<BrowseDashboardsPage />);
+      render(<BrowseDashboardsPage queryParams={{}} />);
 
       const checkbox = await screen.findByTestId(
         selectors.pages.BrowseDashboards.table.checkbox(folderA_folderA.item.uid)
diff --git a/public/app/features/browse-dashboards/BrowseDashboardsPage.tsx b/public/app/features/browse-dashboards/BrowseDashboardsPage.tsx
index 76b7fe057b9..7a58ec579ae 100644
--- a/public/app/features/browse-dashboards/BrowseDashboardsPage.tsx
+++ b/public/app/features/browse-dashboards/BrowseDashboardsPage.tsx
@@ -25,13 +25,14 @@ import { BrowseFilters } from './components/BrowseFilters';
 import { BrowseView } from './components/BrowseView';
 import CreateNewButton from './components/CreateNewButton';
 import { FolderActionsButton } from './components/FolderActionsButton';
+import { ProvisionedFolderPreviewBanner } from './components/ProvisionedFolderPreviewBanner';
 import { SearchView } from './components/SearchView';
 import { getFolderPermissions } from './permissions';
 import { useHasSelection } from './state/hooks';
 import { setAllSelection } from './state/slice';
 
 // New Browse/Manage/Search Dashboards views for nested folders
-const BrowseDashboardsPage = memo(() => {
+const BrowseDashboardsPage = memo(({ queryParams }: { queryParams: Record<string, string> }) => {
   const { uid: folderUID } = useParams();
   const dispatch = useDispatch();
 
@@ -159,6 +160,7 @@ const BrowseDashboardsPage = memo(() => {
       }
     >
       <Page.Contents className={styles.pageContents}>
+        <ProvisionedFolderPreviewBanner queryParams={queryParams} />
         <div>
           <FilterInput
             placeholder={getSearchPlaceholder(searchState.includePanels)}
diff --git a/public/app/features/browse-dashboards/components/NewProvisionedFolderForm.test.tsx b/public/app/features/browse-dashboards/components/NewProvisionedFolderForm.test.tsx
index 9f44b30f384..e4c7527c079 100644
--- a/public/app/features/browse-dashboards/components/NewProvisionedFolderForm.test.tsx
+++ b/public/app/features/browse-dashboards/components/NewProvisionedFolderForm.test.tsx
@@ -161,7 +161,7 @@ describe('NewProvisionedFolderForm', () => {
     (getAppEvents as jest.Mock).mockReturnValue(mockAppEvents);
 
     // Mock usePullRequestParam
-    (usePullRequestParam as jest.Mock).mockReturnValue(null);
+    (usePullRequestParam as jest.Mock).mockReturnValue({});
 
     // Mock useCreateRepositoryFilesWithPathMutation
     const mockCreate = jest.fn();
@@ -409,7 +409,7 @@ describe('NewProvisionedFolderForm', () => {
   });
 
   it('should show PR link when PR URL is available', () => {
-    (usePullRequestParam as jest.Mock).mockReturnValue('https://github.com/grafana/grafana/pull/1234');
+    (usePullRequestParam as jest.Mock).mockReturnValue({ prURL: 'https://github.com/grafana/grafana/pull/1234' });
 
     setup();
 
diff --git a/public/app/features/browse-dashboards/components/NewProvisionedFolderForm.tsx b/public/app/features/browse-dashboards/components/NewProvisionedFolderForm.tsx
index ed03a23cb7a..10a9e429099 100644
--- a/public/app/features/browse-dashboards/components/NewProvisionedFolderForm.tsx
+++ b/public/app/features/browse-dashboards/components/NewProvisionedFolderForm.tsx
@@ -30,7 +30,7 @@ interface Props {
 }
 
 function FormContent({ initialValues, repository, workflowOptions, folder, isGitHub, onDismiss }: FormProps) {
-  const prURL = usePullRequestParam();
+  const { prURL } = usePullRequestParam();
   const navigate = useNavigate();
   const [create, request] = useCreateRepositoryFilesWithPathMutation();
 
diff --git a/public/app/features/browse-dashboards/components/ProvisionedFolderPreviewBanner.tsx b/public/app/features/browse-dashboards/components/ProvisionedFolderPreviewBanner.tsx
new file mode 100644
index 00000000000..57443939fa6
--- /dev/null
+++ b/public/app/features/browse-dashboards/components/ProvisionedFolderPreviewBanner.tsx
@@ -0,0 +1,23 @@
+import { config } from '@grafana/runtime';
+import { CommonBannerProps } from 'app/features/dashboard-scene/saving/provisioned/DashboardPreviewBanner';
+import { PreviewBannerViewPR } from 'app/features/dashboard-scene/saving/provisioned/PreviewBannerViewPR';
+import { usePullRequestParam } from 'app/features/provisioning/hooks/usePullRequestParam';
+
+export function ProvisionedFolderPreviewBanner({ queryParams }: CommonBannerProps) {
+  const provisioningEnabled = config.featureToggles.provisioning;
+  const { prURL, newPrURL } = usePullRequestParam();
+
+  if (!provisioningEnabled || 'kiosk' in queryParams) {
+    return null;
+  }
+
+  if (prURL) {
+    return <PreviewBannerViewPR prParam={prURL} isFolder />;
+  }
+
+  if (newPrURL) {
+    return <PreviewBannerViewPR prParam={newPrURL} isFolder isNewPr />;
+  }
+
+  return null;
+}
diff --git a/public/app/features/dashboard-scene/saving/provisioned/DashboardPreviewBanner.tsx b/public/app/features/dashboard-scene/saving/provisioned/DashboardPreviewBanner.tsx
index 1f7486a921f..ee306bad2f9 100644
--- a/public/app/features/dashboard-scene/saving/provisioned/DashboardPreviewBanner.tsx
+++ b/public/app/features/dashboard-scene/saving/provisioned/DashboardPreviewBanner.tsx
@@ -1,13 +1,14 @@
-import { textUtil } from '@grafana/data';
 import { Trans, t } from '@grafana/i18n';
 import { config } from '@grafana/runtime';
-import { Alert, Icon, Stack } from '@grafana/ui';
+import { Alert } from '@grafana/ui';
 import { useGetRepositoryFilesWithPathQuery } from 'app/api/clients/provisioning/v0alpha1';
 import { DashboardPageRouteSearchParams } from 'app/features/dashboard/containers/types';
 import { usePullRequestParam } from 'app/features/provisioning/hooks/usePullRequestParam';
 import { DashboardRoutes } from 'app/types';
 
-interface CommonBannerProps {
+import { PreviewBannerViewPR } from './PreviewBannerViewPR';
+
+export interface CommonBannerProps {
   queryParams: DashboardPageRouteSearchParams;
   path?: string;
   slug?: string;
@@ -19,13 +20,13 @@ interface DashboardPreviewBannerProps extends CommonBannerProps {
 
 interface DashboardPreviewBannerContentProps extends Required<Omit<CommonBannerProps, 'route'>> {}
 
-const commonAlertProps = {
+export const commonAlertProps = {
   severity: 'info' as const,
   style: { flex: 0 } as const,
 };
 
 function DashboardPreviewBannerContent({ queryParams, slug, path }: DashboardPreviewBannerContentProps) {
-  const prParam = usePullRequestParam();
+  const { prURL } = usePullRequestParam();
   const file = useGetRepositoryFilesWithPathQuery({ name: slug, path, ref: queryParams.ref });
 
   if (file.data?.errors) {
@@ -43,56 +44,14 @@ function DashboardPreviewBannerContent({ queryParams, slug, path }: DashboardPre
   }
 
   // This page was loaded with a `pull_request_url` in the URL
-  if (prParam?.length) {
-    return (
-      <Alert
-        {...commonAlertProps}
-        title={t(
-          'dashboard-scene.dashboard-preview-banner.title-dashboard-loaded-request-git-hub',
-          'This dashboard is loaded from a pull request in GitHub.'
-        )}
-        buttonContent={
-          <Stack alignItems="center">
-            <Trans i18nKey="dashboard-scene.dashboard-preview-banner.view-pull-request-in-git-hub">
-              View pull request in GitHub
-            </Trans>
-            <Icon name="external-link-alt" />
-          </Stack>
-        }
-        onRemove={() => window.open(textUtil.sanitizeUrl(prParam), '_blank')}
-      >
-        <Trans i18nKey="dashboard-scene.dashboard-preview-banner.value-not-saved">
-          The value is not yet saved in the Grafana database
-        </Trans>
-      </Alert>
-    );
+  if (prURL?.length) {
+    return <PreviewBannerViewPR prParam={prURL} />;
   }
 
   // Check if this is a GitHub link
   const githubURL = file.data?.urls?.newPullRequestURL ?? file.data?.urls?.compareURL;
   if (githubURL) {
-    return (
-      <Alert
-        {...commonAlertProps}
-        title={t(
-          'dashboard-scene.dashboard-preview-banner.title-dashboard-loaded-branch-git-hub',
-          'This dashboard is loaded from a branch in GitHub.'
-        )}
-        buttonContent={
-          <Stack alignItems="center">
-            <Trans i18nKey="dashboard-scene.dashboard-preview-banner.open-pull-request-in-git-hub">
-              Open pull request in GitHub
-            </Trans>
-            <Icon name="external-link-alt" />
-          </Stack>
-        }
-        onRemove={() => window.open(textUtil.sanitizeUrl(githubURL), '_blank')}
-      >
-        <Trans i18nKey="dashboard-scene.dashboard-preview-banner.not-saved">
-          The value is not yet saved in the Grafana database
-        </Trans>
-      </Alert>
-    );
+    return <PreviewBannerViewPR prParam={githubURL} isNewPr />;
   }
 
   return (
diff --git a/public/app/features/dashboard-scene/saving/provisioned/PreviewBannerViewPR.test.tsx b/public/app/features/dashboard-scene/saving/provisioned/PreviewBannerViewPR.test.tsx
new file mode 100644
index 00000000000..de716143ac0
--- /dev/null
+++ b/public/app/features/dashboard-scene/saving/provisioned/PreviewBannerViewPR.test.tsx
@@ -0,0 +1,125 @@
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+
+import { textUtil } from '@grafana/data';
+
+import { PreviewBannerViewPR } from './PreviewBannerViewPR';
+
+jest.mock('@grafana/data', () => ({
+  ...jest.requireActual('@grafana/data'),
+  textUtil: {
+    sanitizeUrl: jest.fn(),
+  },
+}));
+
+jest.mock('@grafana/i18n', () => ({
+  t: jest.fn((key: string, defaultValue: string) => defaultValue),
+  Trans: ({ children }: { children: React.ReactNode }) => children,
+}));
+
+const mockTextUtil = jest.mocked(textUtil);
+
+function setup(props: { prParam: string; isFolder?: boolean; isNewPr?: boolean } = { prParam: 'test-url' }) {
+  const defaultProps = {
+    isFolder: false,
+    isNewPr: false,
+    ...props,
+  };
+
+  const renderResult = render(<PreviewBannerViewPR {...defaultProps} />);
+
+  return { renderResult, props: defaultProps };
+}
+
+describe('PreviewBannerViewPR', () => {
+  let windowOpenSpy: jest.SpyInstance;
+
+  beforeAll(() => {
+    Object.defineProperty(window, 'open', {
+      writable: true,
+      value: jest.fn(),
+    });
+    windowOpenSpy = jest.spyOn(window, 'open');
+  });
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockTextUtil.sanitizeUrl.mockImplementation((url) => url);
+  });
+
+  afterEach(() => {
+    jest.restoreAllMocks();
+  });
+
+  afterAll(() => {
+    windowOpenSpy.mockRestore();
+  });
+
+  describe('Dashboard scenarios', () => {
+    it('should render correct text for new PR dashboard', () => {
+      setup({ prParam: 'test-url', isFolder: false, isNewPr: true });
+
+      expect(screen.getByRole('status')).toBeInTheDocument();
+      expect(screen.getByText('This dashboard is loaded from a branch in GitHub.')).toBeInTheDocument();
+    });
+
+    it('should render correct text for existing PR dashboard', () => {
+      setup({ prParam: 'test-url', isFolder: false, isNewPr: false });
+
+      expect(screen.getByRole('status')).toBeInTheDocument();
+      expect(screen.getByText('This dashboard is loaded from a pull request in GitHub.')).toBeInTheDocument();
+    });
+
+    it('should render correct button text for new PR dashboard', () => {
+      setup({ prParam: 'test-url', isFolder: false, isNewPr: true });
+
+      expect(screen.getByText('Open pull request in GitHub')).toBeInTheDocument();
+    });
+
+    it('should render correct button text for existing PR dashboard', () => {
+      setup({ prParam: 'test-url', isFolder: false, isNewPr: false });
+
+      expect(screen.getByText('View pull request in GitHub')).toBeInTheDocument();
+    });
+  });
+
+  describe('Folder scenarios', () => {
+    it('should render correct text for new PR folder', () => {
+      setup({ prParam: 'test-url', isFolder: true, isNewPr: true });
+
+      expect(screen.getByRole('status')).toBeInTheDocument();
+      expect(screen.getByText('A new folder has been created in a branch in GitHub.')).toBeInTheDocument();
+    });
+
+    it('should render correct text for existing PR folder', () => {
+      setup({ prParam: 'test-url', isFolder: true, isNewPr: false });
+
+      expect(screen.getByRole('status')).toBeInTheDocument();
+      expect(screen.getByText('A new folder has been created in a pull request in GitHub.')).toBeInTheDocument();
+    });
+
+    it('should render correct button text for new PR folder', () => {
+      setup({ prParam: 'test-url', isFolder: true, isNewPr: true });
+
+      expect(screen.getByText('Open pull request in GitHub')).toBeInTheDocument();
+    });
+
+    it('should render correct button text for existing PR folder', () => {
+      setup({ prParam: 'test-url', isFolder: true, isNewPr: false });
+
+      expect(screen.getByText('View pull request in GitHub')).toBeInTheDocument();
+    });
+  });
+
+  describe('Button functionality', () => {
+    it('should open URL in new tab when button is clicked', async () => {
+      const testUrl = 'https://github.com/test/repo/pull/123';
+      setup({ prParam: testUrl });
+
+      const button = screen.getByRole('button', { name: /close alert/i });
+      await userEvent.click(button);
+
+      expect(windowOpenSpy).toHaveBeenCalledWith(testUrl, '_blank');
+    });
+  });
+});
diff --git a/public/app/features/dashboard-scene/saving/provisioned/PreviewBannerViewPR.tsx b/public/app/features/dashboard-scene/saving/provisioned/PreviewBannerViewPR.tsx
new file mode 100644
index 00000000000..2188c4029a0
--- /dev/null
+++ b/public/app/features/dashboard-scene/saving/provisioned/PreviewBannerViewPR.tsx
@@ -0,0 +1,64 @@
+import { textUtil } from '@grafana/data';
+import { Trans, t } from '@grafana/i18n';
+import { Alert, Icon, Stack } from '@grafana/ui';
+
+import { commonAlertProps } from './DashboardPreviewBanner';
+
+// TODO: We have this https://github.com/grafana/git-ui-sync-project/issues/166 to add more details about the PR.
+
+interface Props {
+  prParam: string;
+  isFolder?: boolean;
+  isNewPr?: boolean;
+}
+
+/**
+ * @description This component is used to display a banner when a provisioned dashboard/folder is created or loaded from a new branch in Github.
+ */
+export function PreviewBannerViewPR({ prParam, isFolder = false, isNewPr }: Props) {
+  const titleText = isFolder
+    ? isNewPr
+      ? t(
+          'provisioned-resource-preview-banner.title-folder-created-branch-git-hub',
+          'A new folder has been created in a branch in GitHub.'
+        )
+      : t(
+          'provisioned-resource-preview-banner.title-folder-created-pull-request-git-hub',
+          'A new folder has been created in a pull request in GitHub.'
+        )
+    : isNewPr
+      ? t(
+          'provisioned-resource-preview-banner.title-dashboard-loaded-branch-git-hub',
+          'This dashboard is loaded from a branch in GitHub.'
+        )
+      : t(
+          'provisioned-resource-preview-banner.title-dashboard-loaded-pull-request-git-hub',
+          'This dashboard is loaded from a pull request in GitHub.'
+        );
+
+  return (
+    <Alert
+      {...commonAlertProps}
+      title={titleText}
+      buttonContent={
+        <Stack alignItems="center">
+          {isNewPr
+            ? t(
+                'provisioned-resource-preview-banner.preview-banner.open-pull-request-in-git-hub',
+                'Open pull request in GitHub'
+              )
+            : t(
+                'provisioned-resource-preview-banner.preview-banner.view-pull-request-in-git-hub',
+                'View pull request in GitHub'
+              )}
+          <Icon name="external-link-alt" />
+        </Stack>
+      }
+      onRemove={() => window.open(textUtil.sanitizeUrl(prParam), '_blank')}
+    >
+      <Trans i18nKey="provisioned-resource-preview-banner.preview-banner.not-saved">
+        The value is not yet saved in the Grafana database
+      </Trans>
+    </Alert>
+  );
+}
diff --git a/public/app/features/provisioning/hooks/usePullRequestParam.ts b/public/app/features/provisioning/hooks/usePullRequestParam.ts
index 911a8ce988a..e4432232900 100644
--- a/public/app/features/provisioning/hooks/usePullRequestParam.ts
+++ b/public/app/features/provisioning/hooks/usePullRequestParam.ts
@@ -4,10 +4,10 @@ import { useUrlParams } from 'app/core/navigation/hooks';
 export const usePullRequestParam = () => {
   const [params] = useUrlParams();
   const prParam = params.get('pull_request_url');
+  const newPrParam = params.get('new_pull_request_url');
 
-  if (!prParam) {
-    return undefined;
-  }
-
-  return textUtil.sanitizeUrl(decodeURIComponent(prParam));
+  return {
+    prURL: prParam ? textUtil.sanitizeUrl(prParam) : undefined,
+    newPrURL: newPrParam ? textUtil.sanitizeUrl(newPrParam) : undefined,
+  };
 };
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index ff317b5d624..4334abe4952 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -5472,15 +5472,9 @@
       "type": "Type"
     },
     "dashboard-preview-banner": {
-      "not-saved": "The value is not yet saved in the Grafana database",
       "not-yet-saved": "The value is not saved in the Grafana database",
-      "open-pull-request-in-git-hub": "Open pull request in GitHub",
-      "title-dashboard-loaded-branch-git-hub": "This dashboard is loaded from a branch in GitHub.",
       "title-dashboard-loaded-external-repository": "This dashboard is loaded from an external repository",
-      "title-dashboard-loaded-request-git-hub": "This dashboard is loaded from a pull request in GitHub.",
-      "title-error-loading-dashboard": "Error loading dashboard",
-      "value-not-saved": "The value is not yet saved in the Grafana database",
-      "view-pull-request-in-git-hub": "View pull request in GitHub"
+      "title-error-loading-dashboard": "Error loading dashboard"
     },
     "dashboard-scene": {
       "text": {
@@ -10312,6 +10306,17 @@
       "label-workflow": "Workflow"
     }
   },
+  "provisioned-resource-preview-banner": {
+    "preview-banner": {
+      "not-saved": "The value is not yet saved in the Grafana database",
+      "open-pull-request-in-git-hub": "Open pull request in GitHub",
+      "view-pull-request-in-git-hub": "View pull request in GitHub"
+    },
+    "title-dashboard-loaded-branch-git-hub": "This dashboard is loaded from a branch in GitHub.",
+    "title-dashboard-loaded-pull-request-git-hub": "This dashboard is loaded from a pull request in GitHub.",
+    "title-folder-created-branch-git-hub": "A new folder has been created in a branch in GitHub.",
+    "title-folder-created-pull-request-git-hub": "A new folder has been created in a pull request in GitHub."
+  },
   "provisioning": {
     "banner": {
       "message": "This feature is currently under active development. For the best experience and latest improvements, we recommend using the <2>nightly build</2> of Grafana."

From 5d2bbfd3ee67dd99713eb2ef25edcd882b36a63c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 8 Jul 2025 11:27:09 +0000
Subject: [PATCH 09/21] Update dependency @rollup/plugin-node-resolve to
 v16.0.1 (#107766)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 packages/grafana-data/package.json          |  2 +-
 packages/grafana-e2e-selectors/package.json |  2 +-
 packages/grafana-flamegraph/package.json    |  2 +-
 packages/grafana-prometheus/package.json    |  2 +-
 packages/grafana-runtime/package.json       |  2 +-
 packages/grafana-schema/package.json        |  2 +-
 packages/grafana-ui/package.json            |  2 +-
 yarn.lock                                   | 22 ++++++++++-----------
 8 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/packages/grafana-data/package.json b/packages/grafana-data/package.json
index 56263ed62a2..2905b84d88c 100644
--- a/packages/grafana-data/package.json
+++ b/packages/grafana-data/package.json
@@ -84,7 +84,7 @@
   },
   "devDependencies": {
     "@grafana/tsconfig": "^2.0.0",
-    "@rollup/plugin-node-resolve": "16.0.0",
+    "@rollup/plugin-node-resolve": "16.0.1",
     "@types/history": "4.7.11",
     "@types/lodash": "4.17.15",
     "@types/node": "22.15.0",
diff --git a/packages/grafana-e2e-selectors/package.json b/packages/grafana-e2e-selectors/package.json
index 02d669fe21e..aaa4a34e671 100644
--- a/packages/grafana-e2e-selectors/package.json
+++ b/packages/grafana-e2e-selectors/package.json
@@ -39,7 +39,7 @@
     "postpack": "mv package.json.bak package.json"
   },
   "devDependencies": {
-    "@rollup/plugin-node-resolve": "16.0.0",
+    "@rollup/plugin-node-resolve": "16.0.1",
     "@types/node": "22.15.0",
     "@types/semver": "7.7.0",
     "esbuild": "0.25.0",
diff --git a/packages/grafana-flamegraph/package.json b/packages/grafana-flamegraph/package.json
index e8c0d1cfbf4..ade58dd77c1 100644
--- a/packages/grafana-flamegraph/package.json
+++ b/packages/grafana-flamegraph/package.json
@@ -60,7 +60,7 @@
     "@babel/preset-env": "7.26.9",
     "@babel/preset-react": "7.26.3",
     "@grafana/tsconfig": "^2.0.0",
-    "@rollup/plugin-node-resolve": "16.0.0",
+    "@rollup/plugin-node-resolve": "16.0.1",
     "@testing-library/dom": "10.4.0",
     "@testing-library/jest-dom": "^6.1.2",
     "@testing-library/react": "16.2.0",
diff --git a/packages/grafana-prometheus/package.json b/packages/grafana-prometheus/package.json
index 091d6fab771..9f611a44aa3 100644
--- a/packages/grafana-prometheus/package.json
+++ b/packages/grafana-prometheus/package.json
@@ -82,7 +82,7 @@
     "@rollup/plugin-dynamic-import-vars": "2.1.5",
     "@rollup/plugin-image": "3.0.3",
     "@rollup/plugin-json": "6.1.0",
-    "@rollup/plugin-node-resolve": "16.0.0",
+    "@rollup/plugin-node-resolve": "16.0.1",
     "@testing-library/jest-dom": "6.6.3",
     "@testing-library/react": "16.2.0",
     "@testing-library/user-event": "14.6.1",
diff --git a/packages/grafana-runtime/package.json b/packages/grafana-runtime/package.json
index aa8375e5b7a..9b944a5737a 100644
--- a/packages/grafana-runtime/package.json
+++ b/packages/grafana-runtime/package.json
@@ -68,7 +68,7 @@
   },
   "devDependencies": {
     "@grafana/tsconfig": "^2.0.0",
-    "@rollup/plugin-node-resolve": "16.0.0",
+    "@rollup/plugin-node-resolve": "16.0.1",
     "@rollup/plugin-terser": "0.4.4",
     "@testing-library/dom": "10.4.0",
     "@testing-library/react": "16.2.0",
diff --git a/packages/grafana-schema/package.json b/packages/grafana-schema/package.json
index 059974d9982..466b6adcbfc 100644
--- a/packages/grafana-schema/package.json
+++ b/packages/grafana-schema/package.json
@@ -37,7 +37,7 @@
   },
   "devDependencies": {
     "@grafana/tsconfig": "^2.0.0",
-    "@rollup/plugin-node-resolve": "16.0.0",
+    "@rollup/plugin-node-resolve": "16.0.1",
     "esbuild": "0.25.0",
     "glob": "^11.0.0",
     "rimraf": "6.0.1",
diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json
index 9c59995e664..f428a9f11c4 100644
--- a/packages/grafana-ui/package.json
+++ b/packages/grafana-ui/package.json
@@ -135,7 +135,7 @@
     "@babel/core": "7.26.10",
     "@faker-js/faker": "^9.0.0",
     "@grafana/tsconfig": "^2.0.0",
-    "@rollup/plugin-node-resolve": "16.0.0",
+    "@rollup/plugin-node-resolve": "16.0.1",
     "@storybook/addon-a11y": "^8.6.2",
     "@storybook/addon-actions": "^8.6.2",
     "@storybook/addon-docs": "^8.6.2",
diff --git a/yarn.lock b/yarn.lock
index 88eb9b9d347..3e5038936e1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3064,7 +3064,7 @@ __metadata:
     "@grafana/schema": "npm:12.1.0-pre"
     "@grafana/tsconfig": "npm:^2.0.0"
     "@leeoniya/ufuzzy": "npm:1.0.18"
-    "@rollup/plugin-node-resolve": "npm:16.0.0"
+    "@rollup/plugin-node-resolve": "npm:16.0.1"
     "@types/d3-interpolate": "npm:^3.0.0"
     "@types/history": "npm:4.7.11"
     "@types/lodash": "npm:4.17.15"
@@ -3114,7 +3114,7 @@ __metadata:
   resolution: "@grafana/e2e-selectors@workspace:packages/grafana-e2e-selectors"
   dependencies:
     "@grafana/tsconfig": "npm:^2.0.0"
-    "@rollup/plugin-node-resolve": "npm:16.0.0"
+    "@rollup/plugin-node-resolve": "npm:16.0.1"
     "@types/node": "npm:22.15.0"
     "@types/semver": "npm:7.7.0"
     esbuild: "npm:0.25.0"
@@ -3214,7 +3214,7 @@ __metadata:
     "@grafana/tsconfig": "npm:^2.0.0"
     "@grafana/ui": "npm:12.1.0-pre"
     "@leeoniya/ufuzzy": "npm:1.0.18"
-    "@rollup/plugin-node-resolve": "npm:16.0.0"
+    "@rollup/plugin-node-resolve": "npm:16.0.1"
     "@testing-library/dom": "npm:10.4.0"
     "@testing-library/jest-dom": "npm:^6.1.2"
     "@testing-library/react": "npm:16.2.0"
@@ -3452,7 +3452,7 @@ __metadata:
     "@rollup/plugin-dynamic-import-vars": "npm:2.1.5"
     "@rollup/plugin-image": "npm:3.0.3"
     "@rollup/plugin-json": "npm:6.1.0"
-    "@rollup/plugin-node-resolve": "npm:16.0.0"
+    "@rollup/plugin-node-resolve": "npm:16.0.1"
     "@testing-library/jest-dom": "npm:6.6.3"
     "@testing-library/react": "npm:16.2.0"
     "@testing-library/user-event": "npm:14.6.1"
@@ -3510,7 +3510,7 @@ __metadata:
     "@grafana/schema": "npm:12.1.0-pre"
     "@grafana/tsconfig": "npm:^2.0.0"
     "@grafana/ui": "npm:12.1.0-pre"
-    "@rollup/plugin-node-resolve": "npm:16.0.0"
+    "@rollup/plugin-node-resolve": "npm:16.0.1"
     "@rollup/plugin-terser": "npm:0.4.4"
     "@testing-library/dom": "npm:10.4.0"
     "@testing-library/react": "npm:16.2.0"
@@ -3593,7 +3593,7 @@ __metadata:
   resolution: "@grafana/schema@workspace:packages/grafana-schema"
   dependencies:
     "@grafana/tsconfig": "npm:^2.0.0"
-    "@rollup/plugin-node-resolve": "npm:16.0.0"
+    "@rollup/plugin-node-resolve": "npm:16.0.1"
     esbuild: "npm:0.25.0"
     glob: "npm:^11.0.0"
     rimraf: "npm:6.0.1"
@@ -3692,7 +3692,7 @@ __metadata:
     "@react-aria/focus": "npm:3.20.5"
     "@react-aria/overlays": "npm:3.27.3"
     "@react-aria/utils": "npm:3.29.1"
-    "@rollup/plugin-node-resolve": "npm:16.0.0"
+    "@rollup/plugin-node-resolve": "npm:16.0.1"
     "@storybook/addon-a11y": "npm:^8.6.2"
     "@storybook/addon-actions": "npm:^8.6.2"
     "@storybook/addon-docs": "npm:^8.6.2"
@@ -6718,9 +6718,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/plugin-node-resolve@npm:16.0.0":
-  version: 16.0.0
-  resolution: "@rollup/plugin-node-resolve@npm:16.0.0"
+"@rollup/plugin-node-resolve@npm:16.0.1":
+  version: 16.0.1
+  resolution: "@rollup/plugin-node-resolve@npm:16.0.1"
   dependencies:
     "@rollup/pluginutils": "npm:^5.0.1"
     "@types/resolve": "npm:1.20.2"
@@ -6732,7 +6732,7 @@ __metadata:
   peerDependenciesMeta:
     rollup:
       optional: true
-  checksum: 10/018a97667d68bd78d6b1de5597680dcc5785f9339a936984a5715ad2cd7c6f2c85fb9448552b94e6903db35e2d3b218b54e5e9ca048257f2d3bdea2e05d886c7
+  checksum: 10/88fee8c003a5730cca2c06edd200ec6a46c7ab28bed3a99aea6d3070f34f980f575fcbea906946579e41b0be6fd7a2fbc24cdf0ca24f172a555f130726915d8b
   languageName: node
   linkType: hard
 

From 95d49094751d2731c4e1182c0d2ed9b8dffd9f39 Mon Sep 17 00:00:00 2001
From: Gilles De Mey <gilles.de.mey@gmail.com>
Date: Tue, 8 Jul 2025 13:35:09 +0200
Subject: [PATCH 10/21] Alerting: Add oncall contact point type and narrow
 create hook function (#107711)

---
 .../src/grafana/api/v0alpha1/types.ts         | 21 ++++++-
 .../ContactPointSelector.tsx                  |  4 +-
 .../contactPoints/hooks/useContactPoints.tsx  | 25 --------
 .../hooks/v0alpha1/useContactPoints.tsx       | 62 +++++++++++++++++++
 packages/grafana-alerting/src/unstable.ts     | 10 +--
 packages/grafana-alerting/tests/provider.tsx  |  8 +--
 public/app/core/reducers/root.ts              |  4 +-
 .../contactPoint/ContactPointSelector.tsx     |  7 +--
 .../rule-viewer/ContactPointLink.tsx          |  4 +-
 public/app/store/configureStore.ts            |  4 +-
 10 files changed, 98 insertions(+), 51 deletions(-)
 delete mode 100644 packages/grafana-alerting/src/grafana/contactPoints/hooks/useContactPoints.tsx
 create mode 100644 packages/grafana-alerting/src/grafana/contactPoints/hooks/v0alpha1/useContactPoints.tsx

diff --git a/packages/grafana-alerting/src/grafana/api/v0alpha1/types.ts b/packages/grafana-alerting/src/grafana/api/v0alpha1/types.ts
index cc4effa3d3e..acd8045d63e 100644
--- a/packages/grafana-alerting/src/grafana/api/v0alpha1/types.ts
+++ b/packages/grafana-alerting/src/grafana/api/v0alpha1/types.ts
@@ -51,7 +51,26 @@ type SlackIntegration = OverrideProperties<
   }
 >;
 
-export type Integration = EmailIntegration | SlackIntegration | GenericIntegration;
+// Based on https://github.com/grafana/alerting/blob/main/receivers/oncall/config.go#L14-L27
+type OnCallIntegration = OverrideProperties<
+  GenericIntegration,
+  {
+    type: 'OnCall';
+    settings: {
+      url: string;
+      httpMethod?: 'POST' | 'PUT';
+      maxAlerts?: number;
+      authorization_scheme?: string;
+      authorization_credentials?: string;
+      username?: string;
+      password?: string;
+      title?: string;
+      message?: string;
+    };
+  }
+>;
+
+export type Integration = EmailIntegration | SlackIntegration | OnCallIntegration | GenericIntegration;
 
 // Enhanced version of ContactPoint with typed integrations
 // ⚠️ MergeDeep does not check if the property you are overriding exists in the base type and there is no "DeepOverrideProperties" helper
diff --git a/packages/grafana-alerting/src/grafana/contactPoints/components/ContactPointSelector/ContactPointSelector.tsx b/packages/grafana-alerting/src/grafana/contactPoints/components/ContactPointSelector/ContactPointSelector.tsx
index 3107319a9ea..56dacd8dca5 100644
--- a/packages/grafana-alerting/src/grafana/contactPoints/components/ContactPointSelector/ContactPointSelector.tsx
+++ b/packages/grafana-alerting/src/grafana/contactPoints/components/ContactPointSelector/ContactPointSelector.tsx
@@ -3,7 +3,7 @@ import { chain } from 'lodash';
 import { Combobox, ComboboxOption } from '@grafana/ui';
 
 import type { ContactPoint } from '../../../api/v0alpha1/types';
-import { useListContactPointsv0alpha1 } from '../../hooks/useContactPoints';
+import { useListContactPoints } from '../../hooks/v0alpha1/useContactPoints';
 import { getContactPointDescription } from '../../utils';
 
 import { CustomComboBoxProps } from './ComboBox.types';
@@ -17,7 +17,7 @@ export type ContactPointSelectorProps = CustomComboBoxProps<ContactPoint>;
  * @TODO make ComboBox accept a ReactNode so we can use icons and such
  */
 function ContactPointSelector(props: ContactPointSelectorProps) {
-  const { currentData: contactPoints, isLoading } = useListContactPointsv0alpha1();
+  const { currentData: contactPoints, isLoading } = useListContactPoints();
 
   // Create a mapping of options with their corresponding contact points
   const contactPointOptions = chain(contactPoints?.items)
diff --git a/packages/grafana-alerting/src/grafana/contactPoints/hooks/useContactPoints.tsx b/packages/grafana-alerting/src/grafana/contactPoints/hooks/useContactPoints.tsx
deleted file mode 100644
index ab0169f2891..00000000000
--- a/packages/grafana-alerting/src/grafana/contactPoints/hooks/useContactPoints.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import { type TypedUseQueryHookResult, fetchBaseQuery } from '@reduxjs/toolkit/query/react';
-
-import { type ListReceiverApiArg, alertingAPI } from '../../api/v0alpha1/api.gen';
-import type { EnhancedListReceiverApiResponse } from '../../api/v0alpha1/types';
-
-// this is a workaround for the fact that the generated types are not narrow enough
-type EnhancedHookResult = TypedUseQueryHookResult<
-  EnhancedListReceiverApiResponse,
-  ListReceiverApiArg,
-  ReturnType<typeof fetchBaseQuery>
->;
-
-/**
- * useListContactPoints is a hook that fetches a list of contact points
- *
- * This function wraps the alertingAPI.useListReceiverQuery with proper typing
- * to ensure that the returned ContactPoints are correctly typed in the data.items array.
- *
- * It automatically uses the configured namespace for the query.
- */
-function useListContactPointsv0alpha1() {
-  return alertingAPI.useListReceiverQuery<EnhancedHookResult>({});
-}
-
-export { useListContactPointsv0alpha1 };
diff --git a/packages/grafana-alerting/src/grafana/contactPoints/hooks/v0alpha1/useContactPoints.tsx b/packages/grafana-alerting/src/grafana/contactPoints/hooks/v0alpha1/useContactPoints.tsx
new file mode 100644
index 00000000000..25d1ab9a6bf
--- /dev/null
+++ b/packages/grafana-alerting/src/grafana/contactPoints/hooks/v0alpha1/useContactPoints.tsx
@@ -0,0 +1,62 @@
+import {
+  type TypedUseMutationResult,
+  type TypedUseQueryHookResult,
+  fetchBaseQuery,
+} from '@reduxjs/toolkit/query/react';
+import { OverrideProperties } from 'type-fest';
+
+import { CreateReceiverApiArg, type ListReceiverApiArg, alertingAPI } from '../../../api/v0alpha1/api.gen';
+import type { ContactPoint, EnhancedListReceiverApiResponse } from '../../../api/v0alpha1/types';
+
+// this is a workaround for the fact that the generated types are not narrow enough
+type ListContactPointsHookResult = TypedUseQueryHookResult<
+  EnhancedListReceiverApiResponse,
+  ListReceiverApiArg,
+  ReturnType<typeof fetchBaseQuery>
+>;
+
+/**
+ * useListContactPoints is a hook that fetches a list of contact points
+ *
+ * This function wraps the alertingAPI.useListReceiverQuery with proper typing
+ * to ensure that the returned ContactPoints are correctly typed in the data.items array.
+ *
+ * It automatically uses the configured namespace for the query.
+ */
+export function useListContactPoints() {
+  return alertingAPI.useListReceiverQuery<ListContactPointsHookResult>({});
+}
+
+// type narrowing mutations requires us to define a few helper types
+type CreateContactPointArgs = OverrideProperties<
+  CreateReceiverApiArg,
+  { receiver: Omit<ContactPoint, 'status' | 'metadata'> }
+>;
+
+type CreateContactPointMutation = TypedUseMutationResult<
+  ContactPoint,
+  CreateContactPointArgs,
+  ReturnType<typeof fetchBaseQuery>
+>;
+
+type UseCreateContactPointOptions = Parameters<
+  typeof alertingAPI.endpoints.createReceiver.useMutation<CreateContactPointMutation>
+>[0];
+
+/**
+ * useCreateContactPoint is a hook that creates a new contact point with one or more integrations
+ *
+ * This function wraps the alertingAPI.useCreateReceiverMutation with proper typing
+ * to ensure that the payload supports type narrowing.
+ */
+export function useCreateContactPoint(options?: UseCreateContactPointOptions) {
+  const [updateFn, result] = alertingAPI.endpoints.createReceiver.useMutation<CreateContactPointMutation>(options);
+
+  const typedUpdateFn = (args: CreateContactPointArgs) => {
+    // @ts-expect-error this one is just impossible for me to figure out
+    const response = updateFn(args);
+    return response;
+  };
+
+  return [typedUpdateFn, result] as const;
+}
diff --git a/packages/grafana-alerting/src/unstable.ts b/packages/grafana-alerting/src/unstable.ts
index f1e7ce62356..5c10dcbf3eb 100644
--- a/packages/grafana-alerting/src/unstable.ts
+++ b/packages/grafana-alerting/src/unstable.ts
@@ -4,14 +4,8 @@
 
 // Contact Points
 export * from './grafana/api/v0alpha1/types';
-export { useListContactPointsv0alpha1 } from './grafana/contactPoints/hooks/useContactPoints';
+export { useListContactPoints } from './grafana/contactPoints/hooks/v0alpha1/useContactPoints';
 export { ContactPointSelector } from './grafana/contactPoints/components/ContactPointSelector/ContactPointSelector';
 
 // Low-level API hooks
-export { alertingAPI as alertingAPIv0alpha1 } from './grafana/api/v0alpha1/api.gen';
-
-// model factories / mocks
-export * as mocksV0alpha1 from './grafana/api/v0alpha1/mocks/fakes/Receivers';
-
-// MSW handlers
-export * as handlersV0alpha1 from './grafana/api/v0alpha1/mocks/handlers';
+export { alertingAPI } from './grafana/api/v0alpha1/api.gen';
diff --git a/packages/grafana-alerting/tests/provider.tsx b/packages/grafana-alerting/tests/provider.tsx
index 039015eb8bf..4331f7e6b8a 100644
--- a/packages/grafana-alerting/tests/provider.tsx
+++ b/packages/grafana-alerting/tests/provider.tsx
@@ -2,13 +2,13 @@ import { configureStore } from '@reduxjs/toolkit';
 import { useEffect } from 'react';
 import { Provider } from 'react-redux';
 
-import { alertingAPIv0alpha1 } from '../src/unstable';
+import { alertingAPI } from '../src/unstable';
 
 // create an empty store
 export const store = configureStore({
-  middleware: (getDefaultMiddleware) => getDefaultMiddleware().concat(alertingAPIv0alpha1.middleware),
+  middleware: (getDefaultMiddleware) => getDefaultMiddleware().concat(alertingAPI.middleware),
   reducer: {
-    [alertingAPIv0alpha1.reducerPath]: alertingAPIv0alpha1.reducer,
+    [alertingAPI.reducerPath]: alertingAPI.reducer,
   },
 });
 
@@ -35,7 +35,7 @@ export const getDefaultWrapper = () => {
 function useResetQueryCacheAfterUnmount() {
   useEffect(() => {
     return () => {
-      store.dispatch(alertingAPIv0alpha1.util.resetApiState());
+      store.dispatch(alertingAPI.util.resetApiState());
     };
   }, []);
 }
diff --git a/public/app/core/reducers/root.ts b/public/app/core/reducers/root.ts
index d28d2f9caba..67078fdbd27 100644
--- a/public/app/core/reducers/root.ts
+++ b/public/app/core/reducers/root.ts
@@ -1,7 +1,7 @@
 import { ReducersMapObject } from '@reduxjs/toolkit';
 import { AnyAction, combineReducers } from 'redux';
 
-import { alertingAPIv0alpha1 } from '@grafana/alerting/unstable';
+import { alertingAPI as alertingPackageAPI } from '@grafana/alerting/unstable';
 import sharedReducers from 'app/core/reducers';
 import ldapReducers from 'app/features/admin/state/reducers';
 import alertingReducers from 'app/features/alerting/state/reducers';
@@ -61,7 +61,7 @@ const rootReducers = {
   ...authConfigReducers,
   plugins: pluginsReducer,
   [alertingApi.reducerPath]: alertingApi.reducer,
-  [alertingAPIv0alpha1.reducerPath]: alertingAPIv0alpha1.reducer,
+  [alertingPackageAPI.reducerPath]: alertingPackageAPI.reducer,
   [publicDashboardApi.reducerPath]: publicDashboardApi.reducer,
   [browseDashboardsAPI.reducerPath]: browseDashboardsAPI.reducer,
   [cloudMigrationAPI.reducerPath]: cloudMigrationAPI.reducer,
diff --git a/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/simplifiedRouting/contactPoint/ContactPointSelector.tsx b/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/simplifiedRouting/contactPoint/ContactPointSelector.tsx
index a2e88321e4f..c512615ce78 100644
--- a/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/simplifiedRouting/contactPoint/ContactPointSelector.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/simplifiedRouting/contactPoint/ContactPointSelector.tsx
@@ -3,10 +3,7 @@ import { isEmpty } from 'lodash';
 import { useEffect } from 'react';
 import { Controller, useFormContext } from 'react-hook-form';
 
-import {
-  ContactPointSelector as GrafanaManagedContactPointSelector,
-  alertingAPIv0alpha1,
-} from '@grafana/alerting/unstable';
+import { ContactPointSelector as GrafanaManagedContactPointSelector, alertingAPI } from '@grafana/alerting/unstable';
 import { Trans, t } from '@grafana/i18n';
 import { Field, FieldValidationMessage, Stack, TextLink } from '@grafana/ui';
 import { RuleFormValues } from 'app/features/alerting/unified/types/rule-form';
@@ -24,7 +21,7 @@ export function ContactPointSelector({ alertManager }: ContactPointSelectorProps
 
   // check if the contact point still exists, we'll use listReceiver to check if the contact point exists because getReceiver doesn't work with
   // contact point titles but with UUIDs (which is not what we store on the alert rule definition)
-  const { currentData, status } = alertingAPIv0alpha1.endpoints.listReceiver.useQuery({
+  const { currentData, status } = alertingAPI.endpoints.listReceiver.useQuery({
     fieldSelector: `spec.title=${contactPointInForm}`,
   });
 
diff --git a/public/app/features/alerting/unified/components/rule-viewer/ContactPointLink.tsx b/public/app/features/alerting/unified/components/rule-viewer/ContactPointLink.tsx
index 14b0a6b87cb..b3c9196e664 100644
--- a/public/app/features/alerting/unified/components/rule-viewer/ContactPointLink.tsx
+++ b/public/app/features/alerting/unified/components/rule-viewer/ContactPointLink.tsx
@@ -1,7 +1,7 @@
 import { ComponentProps } from 'react';
 import Skeleton from 'react-loading-skeleton';
 
-import { alertingAPIv0alpha1 } from '@grafana/alerting/unstable';
+import { alertingAPI } from '@grafana/alerting/unstable';
 import { TextLink } from '@grafana/ui';
 
 import { makeEditContactPointLink } from '../../utils/misc';
@@ -12,7 +12,7 @@ interface ContactPointLinkProps extends Omit<ComponentProps<typeof TextLink>, 'h
 
 export const ContactPointLink = ({ name, ...props }: ContactPointLinkProps) => {
   // find receiver by name – since this is what we store in the alert rule definition
-  const { currentData, isLoading, isSuccess } = alertingAPIv0alpha1.endpoints.listReceiver.useQuery({
+  const { currentData, isLoading, isSuccess } = alertingAPI.endpoints.listReceiver.useQuery({
     fieldSelector: `spec.title=${name}`,
   });
 
diff --git a/public/app/store/configureStore.ts b/public/app/store/configureStore.ts
index c00680f5aae..db0c15c8f7f 100644
--- a/public/app/store/configureStore.ts
+++ b/public/app/store/configureStore.ts
@@ -2,7 +2,7 @@ import { configureStore as reduxConfigureStore, createListenerMiddleware } from
 import { setupListeners } from '@reduxjs/toolkit/query';
 import { Middleware } from 'redux';
 
-import { alertingAPIv0alpha1 } from '@grafana/alerting/unstable';
+import { alertingAPI as alertingPackageAPI } from '@grafana/alerting/unstable';
 import { browseDashboardsAPI } from 'app/features/browse-dashboards/api/browseDashboardsAPI';
 import { publicDashboardApi } from 'app/features/dashboard/api/publicDashboardApi';
 import { cloudMigrationAPI } from 'app/features/migrate-to-cloud/api';
@@ -43,7 +43,7 @@ export function configureStore(initialState?: Partial<StoreState>) {
       getDefaultMiddleware({ thunk: true, serializableCheck: false, immutableCheck: false }).concat(
         listenerMiddleware.middleware,
         alertingApi.middleware,
-        alertingAPIv0alpha1.middleware,
+        alertingPackageAPI.middleware,
         publicDashboardApi.middleware,
         browseDashboardsAPI.middleware,
         cloudMigrationAPI.middleware,

From 2fabedc363c9df4fa727ea685f5d394706c3b888 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 8 Jul 2025 11:50:43 +0000
Subject: [PATCH 11/21] Update dependency @types/lodash to v4.17.20 (#107767)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json                                  |  2 +-
 packages/grafana-data/package.json            |  2 +-
 packages/grafana-flamegraph/package.json      |  2 +-
 packages/grafana-prometheus/package.json      |  2 +-
 packages/grafana-runtime/package.json         |  2 +-
 packages/grafana-sql/package.json             |  2 +-
 packages/grafana-ui/package.json              |  2 +-
 .../datasource/azuremonitor/package.json      |  2 +-
 .../datasource/cloud-monitoring/package.json  |  2 +-
 .../package.json                              |  2 +-
 .../grafana-pyroscope-datasource/package.json |  2 +-
 .../grafana-testdata-datasource/package.json  |  2 +-
 .../plugins/datasource/jaeger/package.json    |  2 +-
 .../app/plugins/datasource/loki/package.json  |  2 +-
 .../app/plugins/datasource/mssql/package.json |  2 +-
 .../app/plugins/datasource/mysql/package.json |  2 +-
 .../app/plugins/datasource/parca/package.json |  2 +-
 .../app/plugins/datasource/tempo/package.json |  2 +-
 .../plugins/datasource/zipkin/package.json    |  2 +-
 yarn.lock                                     | 53 ++++++++-----------
 20 files changed, 42 insertions(+), 49 deletions(-)

diff --git a/package.json b/package.json
index 287bf23e960..bea7c19919d 100644
--- a/package.json
+++ b/package.json
@@ -130,7 +130,7 @@
     "@types/jquery": "3.5.32",
     "@types/js-yaml": "^4.0.5",
     "@types/jsurl": "^1.2.28",
-    "@types/lodash": "4.17.15",
+    "@types/lodash": "4.17.20",
     "@types/logfmt": "^1.2.3",
     "@types/lucene": "^2",
     "@types/node": "22.15.0",
diff --git a/packages/grafana-data/package.json b/packages/grafana-data/package.json
index 2905b84d88c..256f64527d1 100644
--- a/packages/grafana-data/package.json
+++ b/packages/grafana-data/package.json
@@ -86,7 +86,7 @@
     "@grafana/tsconfig": "^2.0.0",
     "@rollup/plugin-node-resolve": "16.0.1",
     "@types/history": "4.7.11",
-    "@types/lodash": "4.17.15",
+    "@types/lodash": "4.17.20",
     "@types/node": "22.15.0",
     "@types/papaparse": "5.3.16",
     "@types/react": "18.3.18",
diff --git a/packages/grafana-flamegraph/package.json b/packages/grafana-flamegraph/package.json
index ade58dd77c1..4e744fa3d8a 100644
--- a/packages/grafana-flamegraph/package.json
+++ b/packages/grafana-flamegraph/package.json
@@ -67,7 +67,7 @@
     "@testing-library/user-event": "14.6.1",
     "@types/d3": "^7",
     "@types/jest": "^29.5.4",
-    "@types/lodash": "4.17.15",
+    "@types/lodash": "4.17.20",
     "@types/node": "22.15.0",
     "@types/react": "18.3.18",
     "@types/react-virtualized-auto-sizer": "1.0.4",
diff --git a/packages/grafana-prometheus/package.json b/packages/grafana-prometheus/package.json
index 9f611a44aa3..973cd50edaf 100644
--- a/packages/grafana-prometheus/package.json
+++ b/packages/grafana-prometheus/package.json
@@ -56,7 +56,7 @@
     "@prometheus-io/lezer-promql": "0.304.2",
     "@reduxjs/toolkit": "2.5.1",
     "@types/debounce-promise": "3.1.9",
-    "@types/lodash": "4.17.15",
+    "@types/lodash": "4.17.20",
     "@types/react": "18.3.18",
     "@types/react-dom": "18.3.5",
     "@types/react-highlight-words": "0.20.0",
diff --git a/packages/grafana-runtime/package.json b/packages/grafana-runtime/package.json
index 9b944a5737a..9e557b8e824 100644
--- a/packages/grafana-runtime/package.json
+++ b/packages/grafana-runtime/package.json
@@ -75,7 +75,7 @@
     "@testing-library/user-event": "14.6.1",
     "@types/history": "4.7.11",
     "@types/jest": "29.5.14",
-    "@types/lodash": "4.17.15",
+    "@types/lodash": "4.17.20",
     "@types/react": "18.3.18",
     "@types/react-dom": "18.3.5",
     "esbuild": "0.25.0",
diff --git a/packages/grafana-sql/package.json b/packages/grafana-sql/package.json
index 126c5845fdd..aa600c07f6a 100644
--- a/packages/grafana-sql/package.json
+++ b/packages/grafana-sql/package.json
@@ -42,7 +42,7 @@
     "@testing-library/react": "16.2.0",
     "@testing-library/user-event": "14.6.1",
     "@types/jest": "^29.5.4",
-    "@types/lodash": "4.17.15",
+    "@types/lodash": "4.17.20",
     "@types/node": "22.15.0",
     "@types/react": "18.3.18",
     "@types/react-dom": "18.3.5",
diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json
index f428a9f11c4..f0e1b8692d1 100644
--- a/packages/grafana-ui/package.json
+++ b/packages/grafana-ui/package.json
@@ -80,7 +80,7 @@
     "@react-aria/utils": "3.29.1",
     "@tanstack/react-virtual": "^3.5.1",
     "@types/jquery": "3.5.32",
-    "@types/lodash": "4.17.15",
+    "@types/lodash": "4.17.20",
     "@types/react-table": "7.7.20",
     "calculate-size": "1.1.1",
     "classnames": "2.5.1",
diff --git a/public/app/plugins/datasource/azuremonitor/package.json b/public/app/plugins/datasource/azuremonitor/package.json
index 22636f35f21..1cdbd9eae7b 100644
--- a/public/app/plugins/datasource/azuremonitor/package.json
+++ b/public/app/plugins/datasource/azuremonitor/package.json
@@ -33,7 +33,7 @@
     "@testing-library/react": "16.2.0",
     "@testing-library/user-event": "14.6.1",
     "@types/jest": "29.5.14",
-    "@types/lodash": "4.17.15",
+    "@types/lodash": "4.17.20",
     "@types/node": "22.15.0",
     "@types/prismjs": "1.26.5",
     "@types/react": "18.3.18",
diff --git a/public/app/plugins/datasource/cloud-monitoring/package.json b/public/app/plugins/datasource/cloud-monitoring/package.json
index d6eebbbe1ba..dcbf4c251d7 100644
--- a/public/app/plugins/datasource/cloud-monitoring/package.json
+++ b/public/app/plugins/datasource/cloud-monitoring/package.json
@@ -34,7 +34,7 @@
     "@testing-library/user-event": "14.6.1",
     "@types/debounce-promise": "3.1.9",
     "@types/jest": "29.5.14",
-    "@types/lodash": "4.17.15",
+    "@types/lodash": "4.17.20",
     "@types/node": "22.15.0",
     "@types/prismjs": "1.26.5",
     "@types/react": "18.3.18",
diff --git a/public/app/plugins/datasource/grafana-postgresql-datasource/package.json b/public/app/plugins/datasource/grafana-postgresql-datasource/package.json
index 17a6f59aa44..cc2fde9a4e3 100644
--- a/public/app/plugins/datasource/grafana-postgresql-datasource/package.json
+++ b/public/app/plugins/datasource/grafana-postgresql-datasource/package.json
@@ -22,7 +22,7 @@
     "@testing-library/react": "16.2.0",
     "@testing-library/user-event": "14.6.1",
     "@types/jest": "29.5.14",
-    "@types/lodash": "4.17.15",
+    "@types/lodash": "4.17.20",
     "@types/node": "22.15.0",
     "@types/react": "18.3.18",
     "ts-node": "10.9.2",
diff --git a/public/app/plugins/datasource/grafana-pyroscope-datasource/package.json b/public/app/plugins/datasource/grafana-pyroscope-datasource/package.json
index fa8129f30da..65be0f55f6c 100644
--- a/public/app/plugins/datasource/grafana-pyroscope-datasource/package.json
+++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/package.json
@@ -26,7 +26,7 @@
     "@testing-library/react": "16.2.0",
     "@testing-library/user-event": "14.6.1",
     "@types/jest": "29.5.14",
-    "@types/lodash": "4.17.15",
+    "@types/lodash": "4.17.20",
     "@types/node": "22.15.0",
     "@types/prismjs": "1.26.5",
     "@types/react": "18.3.18",
diff --git a/public/app/plugins/datasource/grafana-testdata-datasource/package.json b/public/app/plugins/datasource/grafana-testdata-datasource/package.json
index 72e56014022..5d1fa9adc72 100644
--- a/public/app/plugins/datasource/grafana-testdata-datasource/package.json
+++ b/public/app/plugins/datasource/grafana-testdata-datasource/package.json
@@ -28,7 +28,7 @@
     "@testing-library/user-event": "14.6.1",
     "@types/d3-random": "^3.0.2",
     "@types/jest": "29.5.14",
-    "@types/lodash": "4.17.15",
+    "@types/lodash": "4.17.20",
     "@types/node": "22.15.0",
     "@types/react": "18.3.18",
     "@types/react-dom": "18.3.5",
diff --git a/public/app/plugins/datasource/jaeger/package.json b/public/app/plugins/datasource/jaeger/package.json
index a1d00286bd9..383c155d43c 100644
--- a/public/app/plugins/datasource/jaeger/package.json
+++ b/public/app/plugins/datasource/jaeger/package.json
@@ -29,7 +29,7 @@
     "@testing-library/react": "16.2.0",
     "@testing-library/user-event": "14.6.1",
     "@types/jest": "29.5.14",
-    "@types/lodash": "4.17.15",
+    "@types/lodash": "4.17.20",
     "@types/logfmt": "^1.2.3",
     "@types/node": "22.15.0",
     "@types/react": "18.3.18",
diff --git a/public/app/plugins/datasource/loki/package.json b/public/app/plugins/datasource/loki/package.json
index a321554f011..0b4be6cada6 100644
--- a/public/app/plugins/datasource/loki/package.json
+++ b/public/app/plugins/datasource/loki/package.json
@@ -31,7 +31,7 @@
     "@testing-library/user-event": "14.6.1",
     "@types/d3-random": "^3.0.2",
     "@types/jest": "29.5.14",
-    "@types/lodash": "4.17.15",
+    "@types/lodash": "4.17.20",
     "@types/node": "22.15.0",
     "@types/react": "18.3.18",
     "@types/react-dom": "18.3.5",
diff --git a/public/app/plugins/datasource/mssql/package.json b/public/app/plugins/datasource/mssql/package.json
index 933d90e34d3..fa734fad0f5 100644
--- a/public/app/plugins/datasource/mssql/package.json
+++ b/public/app/plugins/datasource/mssql/package.json
@@ -23,7 +23,7 @@
     "@testing-library/react": "16.2.0",
     "@testing-library/user-event": "14.6.1",
     "@types/jest": "29.5.14",
-    "@types/lodash": "4.17.15",
+    "@types/lodash": "4.17.20",
     "@types/node": "22.15.0",
     "@types/react": "18.3.18",
     "i18next-parser": "9.3.0",
diff --git a/public/app/plugins/datasource/mysql/package.json b/public/app/plugins/datasource/mysql/package.json
index 15f54a2cfdf..78c0d5c95d3 100644
--- a/public/app/plugins/datasource/mysql/package.json
+++ b/public/app/plugins/datasource/mysql/package.json
@@ -22,7 +22,7 @@
     "@testing-library/react": "16.2.0",
     "@testing-library/user-event": "14.6.1",
     "@types/jest": "29.5.14",
-    "@types/lodash": "4.17.15",
+    "@types/lodash": "4.17.20",
     "@types/node": "22.15.0",
     "@types/react": "18.3.18",
     "ts-node": "10.9.2",
diff --git a/public/app/plugins/datasource/parca/package.json b/public/app/plugins/datasource/parca/package.json
index e45315d5373..18c7a72fad7 100644
--- a/public/app/plugins/datasource/parca/package.json
+++ b/public/app/plugins/datasource/parca/package.json
@@ -22,7 +22,7 @@
     "@testing-library/dom": "10.4.0",
     "@testing-library/react": "16.2.0",
     "@testing-library/user-event": "14.6.1",
-    "@types/lodash": "4.17.15",
+    "@types/lodash": "4.17.20",
     "@types/node": "22.15.0",
     "@types/react": "18.3.18",
     "@types/react-dom": "18.3.5",
diff --git a/public/app/plugins/datasource/tempo/package.json b/public/app/plugins/datasource/tempo/package.json
index a9851c8d91b..e7ac0f7c247 100644
--- a/public/app/plugins/datasource/tempo/package.json
+++ b/public/app/plugins/datasource/tempo/package.json
@@ -44,7 +44,7 @@
     "@testing-library/react": "16.2.0",
     "@testing-library/user-event": "14.6.1",
     "@types/jest": "29.5.14",
-    "@types/lodash": "4.17.15",
+    "@types/lodash": "4.17.20",
     "@types/node": "22.15.0",
     "@types/prismjs": "1.26.5",
     "@types/react": "18.3.18",
diff --git a/public/app/plugins/datasource/zipkin/package.json b/public/app/plugins/datasource/zipkin/package.json
index 75d8c30f09d..d3e3633e78d 100644
--- a/public/app/plugins/datasource/zipkin/package.json
+++ b/public/app/plugins/datasource/zipkin/package.json
@@ -25,7 +25,7 @@
     "@testing-library/jest-dom": "6.6.3",
     "@testing-library/react": "16.2.0",
     "@types/jest": "29.5.14",
-    "@types/lodash": "4.17.15",
+    "@types/lodash": "4.17.20",
     "@types/node": "22.15.0",
     "@types/react": "18.3.18",
     "@types/react-dom": "18.3.5",
diff --git a/yarn.lock b/yarn.lock
index 3e5038936e1..e8e7d6632a8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2534,7 +2534,7 @@ __metadata:
     "@testing-library/react": "npm:16.2.0"
     "@testing-library/user-event": "npm:14.6.1"
     "@types/jest": "npm:29.5.14"
-    "@types/lodash": "npm:4.17.15"
+    "@types/lodash": "npm:4.17.20"
     "@types/node": "npm:22.15.0"
     "@types/prismjs": "npm:1.26.5"
     "@types/react": "npm:18.3.18"
@@ -2577,7 +2577,7 @@ __metadata:
     "@testing-library/react": "npm:16.2.0"
     "@testing-library/user-event": "npm:14.6.1"
     "@types/jest": "npm:29.5.14"
-    "@types/lodash": "npm:4.17.15"
+    "@types/lodash": "npm:4.17.20"
     "@types/node": "npm:22.15.0"
     "@types/react": "npm:18.3.18"
     lodash: "npm:4.17.21"
@@ -2607,7 +2607,7 @@ __metadata:
     "@testing-library/react": "npm:16.2.0"
     "@testing-library/user-event": "npm:14.6.1"
     "@types/jest": "npm:29.5.14"
-    "@types/lodash": "npm:4.17.15"
+    "@types/lodash": "npm:4.17.20"
     "@types/node": "npm:22.15.0"
     "@types/prismjs": "npm:1.26.5"
     "@types/react": "npm:18.3.18"
@@ -2648,7 +2648,7 @@ __metadata:
     "@testing-library/user-event": "npm:14.6.1"
     "@types/d3-random": "npm:^3.0.2"
     "@types/jest": "npm:29.5.14"
-    "@types/lodash": "npm:4.17.15"
+    "@types/lodash": "npm:4.17.20"
     "@types/node": "npm:22.15.0"
     "@types/react": "npm:18.3.18"
     "@types/react-dom": "npm:18.3.5"
@@ -2688,7 +2688,7 @@ __metadata:
     "@testing-library/react": "npm:16.2.0"
     "@testing-library/user-event": "npm:14.6.1"
     "@types/jest": "npm:29.5.14"
-    "@types/lodash": "npm:4.17.15"
+    "@types/lodash": "npm:4.17.20"
     "@types/logfmt": "npm:^1.2.3"
     "@types/node": "npm:22.15.0"
     "@types/react": "npm:18.3.18"
@@ -2732,7 +2732,7 @@ __metadata:
     "@testing-library/user-event": "npm:14.6.1"
     "@types/d3-random": "npm:^3.0.2"
     "@types/jest": "npm:29.5.14"
-    "@types/lodash": "npm:4.17.15"
+    "@types/lodash": "npm:4.17.20"
     "@types/node": "npm:22.15.0"
     "@types/react": "npm:18.3.18"
     "@types/react-dom": "npm:18.3.5"
@@ -2772,7 +2772,7 @@ __metadata:
     "@testing-library/react": "npm:16.2.0"
     "@testing-library/user-event": "npm:14.6.1"
     "@types/jest": "npm:29.5.14"
-    "@types/lodash": "npm:4.17.15"
+    "@types/lodash": "npm:4.17.20"
     "@types/node": "npm:22.15.0"
     "@types/react": "npm:18.3.18"
     i18next-parser: "npm:9.3.0"
@@ -2804,7 +2804,7 @@ __metadata:
     "@testing-library/react": "npm:16.2.0"
     "@testing-library/user-event": "npm:14.6.1"
     "@types/jest": "npm:29.5.14"
-    "@types/lodash": "npm:4.17.15"
+    "@types/lodash": "npm:4.17.20"
     "@types/node": "npm:22.15.0"
     "@types/react": "npm:18.3.18"
     lodash: "npm:4.17.21"
@@ -2832,7 +2832,7 @@ __metadata:
     "@testing-library/dom": "npm:10.4.0"
     "@testing-library/react": "npm:16.2.0"
     "@testing-library/user-event": "npm:14.6.1"
-    "@types/lodash": "npm:4.17.15"
+    "@types/lodash": "npm:4.17.20"
     "@types/node": "npm:22.15.0"
     "@types/react": "npm:18.3.18"
     "@types/react-dom": "npm:18.3.5"
@@ -2870,7 +2870,7 @@ __metadata:
     "@testing-library/user-event": "npm:14.6.1"
     "@types/debounce-promise": "npm:3.1.9"
     "@types/jest": "npm:29.5.14"
-    "@types/lodash": "npm:4.17.15"
+    "@types/lodash": "npm:4.17.20"
     "@types/node": "npm:22.15.0"
     "@types/prismjs": "npm:1.26.5"
     "@types/react": "npm:18.3.18"
@@ -2922,7 +2922,7 @@ __metadata:
     "@testing-library/react": "npm:16.2.0"
     "@testing-library/user-event": "npm:14.6.1"
     "@types/jest": "npm:29.5.14"
-    "@types/lodash": "npm:4.17.15"
+    "@types/lodash": "npm:4.17.20"
     "@types/node": "npm:22.15.0"
     "@types/prismjs": "npm:1.26.5"
     "@types/react": "npm:18.3.18"
@@ -2972,7 +2972,7 @@ __metadata:
     "@testing-library/jest-dom": "npm:6.6.3"
     "@testing-library/react": "npm:16.2.0"
     "@types/jest": "npm:29.5.14"
-    "@types/lodash": "npm:4.17.15"
+    "@types/lodash": "npm:4.17.20"
     "@types/node": "npm:22.15.0"
     "@types/react": "npm:18.3.18"
     "@types/react-dom": "npm:18.3.5"
@@ -3067,7 +3067,7 @@ __metadata:
     "@rollup/plugin-node-resolve": "npm:16.0.1"
     "@types/d3-interpolate": "npm:^3.0.0"
     "@types/history": "npm:4.7.11"
-    "@types/lodash": "npm:4.17.15"
+    "@types/lodash": "npm:4.17.20"
     "@types/node": "npm:22.15.0"
     "@types/papaparse": "npm:5.3.16"
     "@types/react": "npm:18.3.18"
@@ -3221,7 +3221,7 @@ __metadata:
     "@testing-library/user-event": "npm:14.6.1"
     "@types/d3": "npm:^7"
     "@types/jest": "npm:^29.5.4"
-    "@types/lodash": "npm:4.17.15"
+    "@types/lodash": "npm:4.17.20"
     "@types/node": "npm:22.15.0"
     "@types/react": "npm:18.3.18"
     "@types/react-virtualized-auto-sizer": "npm:1.0.4"
@@ -3458,7 +3458,7 @@ __metadata:
     "@testing-library/user-event": "npm:14.6.1"
     "@types/debounce-promise": "npm:3.1.9"
     "@types/jest": "npm:29.5.14"
-    "@types/lodash": "npm:4.17.15"
+    "@types/lodash": "npm:4.17.20"
     "@types/node": "npm:22.15.0"
     "@types/pluralize": "npm:^0.0.33"
     "@types/prismjs": "npm:1.26.5"
@@ -3517,7 +3517,7 @@ __metadata:
     "@testing-library/user-event": "npm:14.6.1"
     "@types/history": "npm:4.7.11"
     "@types/jest": "npm:29.5.14"
-    "@types/lodash": "npm:4.17.15"
+    "@types/lodash": "npm:4.17.20"
     "@types/react": "npm:18.3.18"
     "@types/react-dom": "npm:18.3.5"
     "@types/systemjs": "npm:6.15.1"
@@ -3623,7 +3623,7 @@ __metadata:
     "@testing-library/react": "npm:16.2.0"
     "@testing-library/user-event": "npm:14.6.1"
     "@types/jest": "npm:^29.5.4"
-    "@types/lodash": "npm:4.17.15"
+    "@types/lodash": "npm:4.17.20"
     "@types/node": "npm:22.15.0"
     "@types/react": "npm:18.3.18"
     "@types/react-dom": "npm:18.3.5"
@@ -3721,7 +3721,7 @@ __metadata:
     "@types/is-hotkey": "npm:0.1.10"
     "@types/jest": "npm:29.5.14"
     "@types/jquery": "npm:3.5.32"
-    "@types/lodash": "npm:4.17.15"
+    "@types/lodash": "npm:4.17.20"
     "@types/mock-raf": "npm:1.0.6"
     "@types/node": "npm:22.15.0"
     "@types/prismjs": "npm:1.26.5"
@@ -9632,17 +9632,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/lodash@npm:*, @types/lodash@npm:^4, @types/lodash@npm:^4.14.172":
-  version: 4.17.16
-  resolution: "@types/lodash@npm:4.17.16"
-  checksum: 10/9a8bb7471a7521bd65d528e1bd14f79819a3eeb6f8a35a8a44649a7d773775c0813e93fd93bd32ccf350bb076c0bf02c6d47877c4625f526f6dd4d283c746aec
-  languageName: node
-  linkType: hard
-
-"@types/lodash@npm:4.17.15":
-  version: 4.17.15
-  resolution: "@types/lodash@npm:4.17.15"
-  checksum: 10/27b348b5971b9c670215331b52448a13d7d65bf1fbd320a7049c9c153c1186ff5d116ba75f05f07d32d7ece8a992b26a30c7bdc9be22a3d1e4e3e6068aa04603
+"@types/lodash@npm:*, @types/lodash@npm:4.17.20, @types/lodash@npm:^4, @types/lodash@npm:^4.14.172":
+  version: 4.17.20
+  resolution: "@types/lodash@npm:4.17.20"
+  checksum: 10/8cd8ad3bd78d2e06a93ae8d6c9907981d5673655fec7cb274a4d9a59549aab5bb5b3017361280773b8990ddfccf363e14d1b37c97af8a9fe363de677f9a61524
   languageName: node
   linkType: hard
 
@@ -18204,7 +18197,7 @@ __metadata:
     "@types/jquery": "npm:3.5.32"
     "@types/js-yaml": "npm:^4.0.5"
     "@types/jsurl": "npm:^1.2.28"
-    "@types/lodash": "npm:4.17.15"
+    "@types/lodash": "npm:4.17.20"
     "@types/logfmt": "npm:^1.2.3"
     "@types/lucene": "npm:^2"
     "@types/node": "npm:22.15.0"

From d27d8f02b6877faf659c4de59e98b71a40f09e67 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 8 Jul 2025 12:32:29 +0000
Subject: [PATCH 12/21] Update dependency @types/node-forge to v1.3.12
 (#107769)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index e8e7d6632a8..75841a2897f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9722,11 +9722,11 @@ __metadata:
   linkType: hard
 
 "@types/node-forge@npm:^1, @types/node-forge@npm:^1.3.0":
-  version: 1.3.11
-  resolution: "@types/node-forge@npm:1.3.11"
+  version: 1.3.12
+  resolution: "@types/node-forge@npm:1.3.12"
   dependencies:
     "@types/node": "npm:*"
-  checksum: 10/670c9b377c48189186ec415e3c8ed371f141ecc1a79ab71b213b20816adeffecba44dae4f8406cc0d09e6349a4db14eb8c5893f643d8e00fa19fc035cf49dee0
+  checksum: 10/6840622b4253e04f1848fda7355603d75d0553d9e103e8eeb3c2cd832fe1f6af8a27ebfd70ff8a6b2a6c3737054ca280a9f9b7fb9cfbfb6be69c45ca4861c4aa
   languageName: node
   linkType: hard
 

From a9e70d4a1d3ee9d2c7cbbeb89daa99660e9a256c Mon Sep 17 00:00:00 2001
From: Josh Hunt <joshhunt@users.noreply.github.com>
Date: Tue, 8 Jul 2025 13:37:09 +0100
Subject: [PATCH 13/21] Storybook: Rearrange and tidy stories (#107270)

* Tidy up storybook a little bit

* change sort order, delete some stories

* More tidy up of actions

* More tidy up of actions

* tweak story sorting, again

* Make all internal stories public

* fix sort

* Add ESLint rule to enforce storybook titles

* update verify storybook test

* simplify glob
---
 .betterer.results                             |  42 ++++++
 e2e/storybook/verify.spec.ts                  |   2 +-
 eslint.config.js                              |   7 +
 packages/grafana-eslint-rules/README.md       |  27 ++++
 packages/grafana-eslint-rules/index.cjs       |   2 +
 .../rules/consistent-story-titles.cjs         | 106 +++++++++++++
 .../tests/consistent-stories.test.js          | 117 +++++++++++++++
 packages/grafana-ui/.storybook/main.ts        |   8 +-
 packages/grafana-ui/.storybook/preview.ts     |  82 ++++++++--
 ...InlineBanner.story.tsx => Alert.story.tsx} |  13 +-
 .../src/components/Alert/Toast.story.tsx      | 126 ----------------
 .../AutoSaveField/AutoSaveField.story.tsx     |   2 +-
 .../src/components/Badge/Badge.story.tsx      |   2 +-
 .../components/BarGauge/BarGauge.story.tsx    |   2 +-
 .../components/BigValue/BigValue.story.tsx    |   2 +-
 .../src/components/Button/Button.story.tsx    |   2 +-
 .../ButtonCascader/ButtonCascader.story.tsx   |   2 +-
 ...l.story.tsx => CallToActionCard.story.tsx} |   2 +-
 .../CallToActionCard/CallToActionCard.tsx     |   1 +
 .../src/components/Card/Card.story.tsx        |   5 +-
 .../components/Carousel/Carousel.story.tsx    |   2 +-
 .../components/Cascader/Cascader.story.tsx    |   2 +-
 .../ClickOutsideWrapper.story.tsx             |   2 +-
 .../ClipboardButton/ClipboardButton.story.tsx |   2 +-
 .../ColorPicker/ColorPicker.story.tsx         |  38 +----
 .../ColorPicker/ColorPickerInput.story.tsx    |  32 ++++
 .../ColorPicker/ColorPickerPopover.story.tsx  |  52 -------
 .../components/ColorPicker/Palettes.story.tsx |  43 ------
 .../ColorPicker/SeriesColorPicker.story.tsx   |  39 +++++
 .../components/Combobox/Combobox.story.tsx    |   2 +-
 .../Combobox/MultiCombobox.story.tsx          |   2 +-
 .../ConfirmButton/ConfirmButton.story.tsx     |   2 +-
 .../components/ContextMenu/ContextMenu.mdx    |   2 +
 .../ContextMenu/ContextMenu.story.tsx         |   2 +-
 .../DataSourceHttpSettings.story.tsx          |   2 +-
 .../DatePicker/DatePicker.story.tsx           |   2 +-
 .../DatePickerWithInput.story.tsx             |   2 +-
 .../DateTimePicker/DateTimePicker.story.tsx   |   2 +-
 .../RelativeTimeRangePicker.story.tsx         |   2 +-
 .../DateTimePickers/TimeOfDayPicker.story.tsx |   2 +-
 .../DateTimePickers/TimeRangeInput.story.tsx  |   2 +-
 .../DateTimePickers/TimeRangePicker.story.tsx |   2 +-
 .../DateTimePickers/TimeZonePicker.story.tsx  |   2 +-
 .../DateTimePickers/WeekStartPicker.story.tsx |   2 +-
 .../src/components/Divider/Divider.story.tsx  |   2 +-
 ...ernal.story.tsx => ButtonSelect.story.tsx} |   2 +-
 .../src/components/Dropdown/ButtonSelect.tsx  |   3 +-
 .../EmptySearchResult.story.tsx               |   2 +-
 .../EmptySearchResult/EmptySearchResult.tsx   |   1 +
 .../EmptyState/EmptyState.story.tsx           |   2 +-
 .../ErrorBoundary/ErrorBoundary.story.tsx     |   2 +-
 .../FeatureBadge/FeatureBadge.story.tsx       |   2 +-
 .../FileDropzone/FileDropzone.story.tsx       |   2 +-
 .../FileDropzone/FileListItem.story.tsx       |   2 +-
 .../FileUpload/FileUpload.story.tsx           |   2 +-
 .../FilterPill/FilterPill.story.tsx           |   2 +-
 ...internal.story.tsx => FormField.story.tsx} |   2 +-
 .../FormattedValueDisplay.story.tsx           |   2 +-
 .../src/components/Forms/Checkbox.story.tsx   |   2 +-
 .../Legacy/Input/Input.internal.story.tsx     |  58 --------
 .../Legacy/Select/Select.internal.story.tsx   | 113 --------------
 .../Legacy/Switch/Switch.internal.story.tsx   |  27 ----
 .../RadioButtonGroup.story.tsx                |   2 +-
 .../RadioButtonList/RadioButtonList.story.tsx |   2 +-
 .../src/components/Icon/Icon.story.tsx        |   2 +-
 .../IconButton/IconButton.story.tsx           |   2 +-
 .../src/components/InfoBox/InfoBox.story.tsx  |   2 +-
 ...ternal.story.tsx => InfoTooltip.story.tsx} |   2 +-
 .../components/InfoTooltip/InfoTooltip.tsx    |   1 +
 ...ternal.story.tsx => InlineToast.story.tsx} |   3 +-
 .../components/Input/AutoSizeInput.story.tsx  |   2 +-
 .../src/components/Input/Input.story.tsx      |   2 +-
 .../InteractiveTable.story.tsx                |   2 +-
 .../src/components/Layout/Box/Box.story.tsx   |   2 +-
 .../src/components/Layout/Grid/Grid.story.tsx |   2 +-
 .../src/components/Layout/Layout.story.tsx    |   6 +-
 .../src/components/Layout/Space.story.tsx     |   2 +-
 .../components/Layout/Stack/Stack.story.tsx   |  20 +--
 .../src/components/Link/TextLink.story.tsx    |   2 +-
 .../src/components/List/InlineList.tsx        |   1 +
 ...List.internal.story.tsx => List.story.tsx} |   2 +-
 .../grafana-ui/src/components/List/List.tsx   |   1 +
 .../LoadingBar/LoadingBar.story.tsx           |   2 +-
 .../LoadingPlaceholder.story.tsx              |   2 +-
 .../grafana-ui/src/components/Menu/Menu.mdx   |   2 +-
 .../src/components/Menu/Menu.story.tsx        |   2 +-
 ...nternal.story.tsx => CodeEditor.story.tsx} |   2 +-
 .../PageLayout/PageToolbar.story.tsx          |   2 +-
 .../src/components/PageLayout/PageToolbar.tsx |   2 +-
 .../Pagination/Pagination.story.tsx           |   2 +-
 .../PanelChrome/PanelChrome.story.tsx         |   2 +-
 .../PanelContainer/PanelContainer.story.tsx   |   2 +-
 .../PanelContainer/PanelContainer.tsx         |   2 +
 .../PluginSignatureBadge.story.tsx            |   2 +-
 .../QueryField/QueryField.story.tsx           |   2 +-
 .../RefreshPicker/RefreshPicker.story.tsx     |   2 +-
 .../RenderUserContentAsHTML.story.tsx         |   2 +-
 .../ScrollContainer/ScrollContainer.story.tsx |   2 +-
 ...al.story.tsx => SecretFormField.story.tsx} |   2 +-
 .../SecretInput/SecretInput.story.tsx         |   2 +-
 .../SecretTextArea/SecretTextArea.story.tsx   |   2 +-
 .../src/components/Segment/Segment.story.tsx  |   2 +-
 .../components/Segment/SegmentAsync.story.tsx |   2 +-
 .../components/Segment/SegmentInput.story.tsx |   2 +-
 .../src/components/Select/Select.story.tsx    |   6 +-
 ...nternal.story.tsx => SelectPerf.story.tsx} |   2 +-
 .../components/Slider/RangeSlider.story.tsx   |   2 +-
 .../src/components/Slider/Slider.story.tsx    |   2 +-
 .../src/components/Spinner/Spinner.story.tsx  |   2 +-
 .../components/Splitter/useSplitter.story.tsx |   2 +-
 .../StatsPicker/StatsPicker.story.tsx         |   2 +-
 .../src/components/Switch/Switch.story.tsx    |   2 +-
 .../src/components/Table/Table.story.tsx      |   2 +-
 ...rnal.story.tsx => TableInputCSV.story.tsx} |   2 +-
 .../TableInputCSV/TableInputCSV.tsx           |   1 +
 .../src/components/Tabs/Tabs.story.tsx        |   2 +-
 .../src/components/Tags/Tag.story.tsx         |   2 +-
 .../src/components/Tags/TagList.story.tsx     |   2 +-
 .../components/TagsInput/TagsInput.story.tsx  |   2 +-
 .../src/components/Text/Text.story.tsx        |   2 +-
 .../components/TextArea/TextArea.story.tsx    |   2 +-
 ...ernal.story.tsx => BorderRadius.story.tsx} |   2 +-
 .../ThemeDemos/EmotionPerfTest.story.tsx      |  20 +++
 .../components/ThemeDemos/ThemeDemo.story.tsx |   7 +-
 .../Typography.story.tsx}                     |   5 +-
 .../ToolbarButton/ToolbarButton.story.tsx     |   2 +-
 .../ToolbarButton/ToolbarButtonRow.story.tsx  |   2 +-
 .../UnitPicker/UnitPicker.story.tsx           |   2 +-
 .../UsersIndicator/Avatar.story.tsx           |   2 +-
 .../UsersIndicator/UserIcon.story.tsx         |   2 +-
 .../UsersIndicator/UsersIndicator.story.tsx   |   2 +-
 .../ValuePicker/ValuePicker.story.tsx         |   2 +-
 .../components/VizLayout/VizLayout.story.tsx  |   2 +-
 .../components/VizLegend/VizLegend.story.tsx  |   2 +-
 .../VizTooltip/SeriesTable.story.tsx          |   2 +-
 .../Graph/GraphWithLegend.internal.story.tsx  | 140 ------------------
 ...l.story.tsx => useDelayedSwitch.story.tsx} |   2 +-
 137 files changed, 610 insertions(+), 749 deletions(-)
 create mode 100644 packages/grafana-eslint-rules/rules/consistent-story-titles.cjs
 create mode 100644 packages/grafana-eslint-rules/tests/consistent-stories.test.js
 rename packages/grafana-ui/src/components/Alert/{InlineBanner.story.tsx => Alert.story.tsx} (87%)
 delete mode 100644 packages/grafana-ui/src/components/Alert/Toast.story.tsx
 rename packages/grafana-ui/src/components/CallToActionCard/{CallToActionCard.internal.story.tsx => CallToActionCard.story.tsx} (96%)
 create mode 100644 packages/grafana-ui/src/components/ColorPicker/ColorPickerInput.story.tsx
 delete mode 100644 packages/grafana-ui/src/components/ColorPicker/ColorPickerPopover.story.tsx
 delete mode 100644 packages/grafana-ui/src/components/ColorPicker/Palettes.story.tsx
 create mode 100644 packages/grafana-ui/src/components/ColorPicker/SeriesColorPicker.story.tsx
 rename packages/grafana-ui/src/components/Dropdown/{ButtonSelect.internal.story.tsx => ButtonSelect.story.tsx} (95%)
 rename packages/grafana-ui/src/components/FormField/{FormField.internal.story.tsx => FormField.story.tsx} (95%)
 delete mode 100644 packages/grafana-ui/src/components/Forms/Legacy/Input/Input.internal.story.tsx
 delete mode 100644 packages/grafana-ui/src/components/Forms/Legacy/Select/Select.internal.story.tsx
 delete mode 100644 packages/grafana-ui/src/components/Forms/Legacy/Switch/Switch.internal.story.tsx
 rename packages/grafana-ui/src/components/InfoTooltip/{InfoTooltip.internal.story.tsx => InfoTooltip.story.tsx} (87%)
 rename packages/grafana-ui/src/components/InlineToast/{InlineToast.internal.story.tsx => InlineToast.story.tsx} (93%)
 rename packages/grafana-ui/src/components/List/{List.internal.story.tsx => List.story.tsx} (98%)
 rename packages/grafana-ui/src/components/Monaco/{CodeEditor.internal.story.tsx => CodeEditor.story.tsx} (97%)
 rename packages/grafana-ui/src/components/SecretFormField/{SecretFormField.internal.story.tsx => SecretFormField.story.tsx} (96%)
 rename packages/grafana-ui/src/components/Select/{SelectPerf.internal.story.tsx => SelectPerf.story.tsx} (98%)
 rename packages/grafana-ui/src/components/TableInputCSV/{TableInputCSV.internal.story.tsx => TableInputCSV.story.tsx} (92%)
 rename packages/grafana-ui/src/components/ThemeDemos/{BorderRadius.internal.story.tsx => BorderRadius.story.tsx} (95%)
 create mode 100644 packages/grafana-ui/src/components/ThemeDemos/EmotionPerfTest.story.tsx
 rename packages/grafana-ui/src/components/{Text/Typography.internal.story.tsx => ThemeDemos/Typography.story.tsx} (97%)
 delete mode 100644 packages/grafana-ui/src/graveyard/Graph/GraphWithLegend.internal.story.tsx
 rename packages/grafana-ui/src/utils/{useDelayedSwitch.internal.story.tsx => useDelayedSwitch.story.tsx} (90%)

diff --git a/.betterer.results b/.betterer.results
index fa1406d7eb5..01a8e96aa9f 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -4128,6 +4128,15 @@ exports[`no undocumented stories`] = {
     "packages/grafana-ui/src/components/ButtonCascader/ButtonCascader.story.tsx:5381": [
       [0, 0, 0, "No undocumented stories are allowed, please add an .mdx file with some documentation", "5381"]
     ],
+    "packages/grafana-ui/src/components/CallToActionCard/CallToActionCard.story.tsx:5381": [
+      [0, 0, 0, "No undocumented stories are allowed, please add an .mdx file with some documentation", "5381"]
+    ],
+    "packages/grafana-ui/src/components/ColorPicker/ColorPickerInput.story.tsx:5381": [
+      [0, 0, 0, "No undocumented stories are allowed, please add an .mdx file with some documentation", "5381"]
+    ],
+    "packages/grafana-ui/src/components/ColorPicker/SeriesColorPicker.story.tsx:5381": [
+      [0, 0, 0, "No undocumented stories are allowed, please add an .mdx file with some documentation", "5381"]
+    ],
     "packages/grafana-ui/src/components/DateTimePickers/RelativeTimeRangePicker/RelativeTimeRangePicker.story.tsx:5381": [
       [0, 0, 0, "No undocumented stories are allowed, please add an .mdx file with some documentation", "5381"]
     ],
@@ -4143,12 +4152,27 @@ exports[`no undocumented stories`] = {
     "packages/grafana-ui/src/components/DateTimePickers/WeekStartPicker.story.tsx:5381": [
       [0, 0, 0, "No undocumented stories are allowed, please add an .mdx file with some documentation", "5381"]
     ],
+    "packages/grafana-ui/src/components/Dropdown/ButtonSelect.story.tsx:5381": [
+      [0, 0, 0, "No undocumented stories are allowed, please add an .mdx file with some documentation", "5381"]
+    ],
+    "packages/grafana-ui/src/components/FormField/FormField.story.tsx:5381": [
+      [0, 0, 0, "No undocumented stories are allowed, please add an .mdx file with some documentation", "5381"]
+    ],
+    "packages/grafana-ui/src/components/InfoTooltip/InfoTooltip.story.tsx:5381": [
+      [0, 0, 0, "No undocumented stories are allowed, please add an .mdx file with some documentation", "5381"]
+    ],
+    "packages/grafana-ui/src/components/List/List.story.tsx:5381": [
+      [0, 0, 0, "No undocumented stories are allowed, please add an .mdx file with some documentation", "5381"]
+    ],
     "packages/grafana-ui/src/components/PageLayout/PageToolbar.story.tsx:5381": [
       [0, 0, 0, "No undocumented stories are allowed, please add an .mdx file with some documentation", "5381"]
     ],
     "packages/grafana-ui/src/components/QueryField/QueryField.story.tsx:5381": [
       [0, 0, 0, "No undocumented stories are allowed, please add an .mdx file with some documentation", "5381"]
     ],
+    "packages/grafana-ui/src/components/SecretFormField/SecretFormField.story.tsx:5381": [
+      [0, 0, 0, "No undocumented stories are allowed, please add an .mdx file with some documentation", "5381"]
+    ],
     "packages/grafana-ui/src/components/SecretTextArea/SecretTextArea.story.tsx:5381": [
       [0, 0, 0, "No undocumented stories are allowed, please add an .mdx file with some documentation", "5381"]
     ],
@@ -4161,6 +4185,9 @@ exports[`no undocumented stories`] = {
     "packages/grafana-ui/src/components/Segment/SegmentInput.story.tsx:5381": [
       [0, 0, 0, "No undocumented stories are allowed, please add an .mdx file with some documentation", "5381"]
     ],
+    "packages/grafana-ui/src/components/Select/SelectPerf.story.tsx:5381": [
+      [0, 0, 0, "No undocumented stories are allowed, please add an .mdx file with some documentation", "5381"]
+    ],
     "packages/grafana-ui/src/components/Slider/RangeSlider.story.tsx:5381": [
       [0, 0, 0, "No undocumented stories are allowed, please add an .mdx file with some documentation", "5381"]
     ],
@@ -4170,9 +4197,21 @@ exports[`no undocumented stories`] = {
     "packages/grafana-ui/src/components/StatsPicker/StatsPicker.story.tsx:5381": [
       [0, 0, 0, "No undocumented stories are allowed, please add an .mdx file with some documentation", "5381"]
     ],
+    "packages/grafana-ui/src/components/TableInputCSV/TableInputCSV.story.tsx:5381": [
+      [0, 0, 0, "No undocumented stories are allowed, please add an .mdx file with some documentation", "5381"]
+    ],
+    "packages/grafana-ui/src/components/ThemeDemos/BorderRadius.story.tsx:5381": [
+      [0, 0, 0, "No undocumented stories are allowed, please add an .mdx file with some documentation", "5381"]
+    ],
+    "packages/grafana-ui/src/components/ThemeDemos/EmotionPerfTest.story.tsx:5381": [
+      [0, 0, 0, "No undocumented stories are allowed, please add an .mdx file with some documentation", "5381"]
+    ],
     "packages/grafana-ui/src/components/ThemeDemos/ThemeDemo.story.tsx:5381": [
       [0, 0, 0, "No undocumented stories are allowed, please add an .mdx file with some documentation", "5381"]
     ],
+    "packages/grafana-ui/src/components/ThemeDemos/Typography.story.tsx:5381": [
+      [0, 0, 0, "No undocumented stories are allowed, please add an .mdx file with some documentation", "5381"]
+    ],
     "packages/grafana-ui/src/components/UnitPicker/UnitPicker.story.tsx:5381": [
       [0, 0, 0, "No undocumented stories are allowed, please add an .mdx file with some documentation", "5381"]
     ],
@@ -4184,6 +4223,9 @@ exports[`no undocumented stories`] = {
     ],
     "packages/grafana-ui/src/components/VizTooltip/SeriesTable.story.tsx:5381": [
       [0, 0, 0, "No undocumented stories are allowed, please add an .mdx file with some documentation", "5381"]
+    ],
+    "packages/grafana-ui/src/utils/useDelayedSwitch.story.tsx:5381": [
+      [0, 0, 0, "No undocumented stories are allowed, please add an .mdx file with some documentation", "5381"]
     ]
   }`
 };
diff --git a/e2e/storybook/verify.spec.ts b/e2e/storybook/verify.spec.ts
index 2610b1d5bf6..f6210d890d1 100644
--- a/e2e/storybook/verify.spec.ts
+++ b/e2e/storybook/verify.spec.ts
@@ -3,7 +3,7 @@
 // NOTE: storybook must already be running (`yarn storybook`) for this test to work
 describe('Verify storybook', () => {
   it('Loads the button story correctly', () => {
-    cy.visit('?path=/story/buttons-button--basic');
+    cy.visit('?path=/story/inputs-button--basic');
     getIframeBody().find('button:contains("Example button")').should('be.visible');
   });
 });
diff --git a/eslint.config.js b/eslint.config.js
index 055bb6e4158..9f5bcc9da52 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -176,6 +176,13 @@ module.exports = [
       'react/react-in-jsx-scope': 'off',
     },
   },
+  {
+    name: 'grafana/story-rules',
+    files: ['packages/grafana-ui/src/**/*.story.tsx'],
+    rules: {
+      '@grafana/consistent-story-titles': 'error',
+    },
+  },
   {
     name: 'grafana/public-dashboards-overrides',
     files: ['public/dashboards/scripted*.js'],
diff --git a/packages/grafana-eslint-rules/README.md b/packages/grafana-eslint-rules/README.md
index 3fb9a053670..be49122b758 100644
--- a/packages/grafana-eslint-rules/README.md
+++ b/packages/grafana-eslint-rules/README.md
@@ -113,3 +113,30 @@ const getStyles = (theme: GrafanaTheme2) => ({
 ### `theme-token-usage`
 
 Used to find all instances of `theme` tokens being used in the codebase and emit the counts as metrics. Should **not** be used as an actual lint rule!
+
+### `consistent-story-titles`
+
+Enforce consistent Storybook titles in `.story.tsx` files.
+
+Storybook titles should not contain more than one `/` for sections (resulting in maximum 2 parts), unless one of the sections is 'Deprecated'. This helps maintain a clean and organized Storybook structure.
+
+#### Examples
+
+```tsx
+// Bad ❌
+export default { title: 'Components/Forms/Button' };
+
+// Good ✅
+export default { title: 'Components/Button' };
+
+// Good ✅ - Deprecated allows any number of sections
+export default { title: 'Components/Deprecated/Forms/Button/Extra' };
+
+// Good ✅ - Variable assignment pattern
+const storyConfig = { title: 'Components/Button' };
+export default storyConfig;
+
+// Bad ❌ - Variable assignment with too many sections
+const storyConfig = { title: 'Components/Forms/Button' };
+export default storyConfig;
+```
diff --git a/packages/grafana-eslint-rules/index.cjs b/packages/grafana-eslint-rules/index.cjs
index 2babd165372..438d88332bc 100644
--- a/packages/grafana-eslint-rules/index.cjs
+++ b/packages/grafana-eslint-rules/index.cjs
@@ -3,6 +3,7 @@ const noBorderRadiusLiteral = require('./rules/no-border-radius-literal.cjs');
 const noUnreducedMotion = require('./rules/no-unreduced-motion.cjs');
 const themeTokenUsage = require('./rules/theme-token-usage.cjs');
 const noRestrictedImgSrcs = require('./rules/no-restricted-img-srcs.cjs');
+const consistentStoryTitles = require('./rules/consistent-story-titles.cjs');
 
 module.exports = {
   rules: {
@@ -11,5 +12,6 @@ module.exports = {
     'no-border-radius-literal': noBorderRadiusLiteral,
     'theme-token-usage': themeTokenUsage,
     'no-restricted-img-srcs': noRestrictedImgSrcs,
+    'consistent-story-titles': consistentStoryTitles,
   },
 };
diff --git a/packages/grafana-eslint-rules/rules/consistent-story-titles.cjs b/packages/grafana-eslint-rules/rules/consistent-story-titles.cjs
new file mode 100644
index 00000000000..9fe077d699b
--- /dev/null
+++ b/packages/grafana-eslint-rules/rules/consistent-story-titles.cjs
@@ -0,0 +1,106 @@
+// @ts-check
+const { ESLintUtils, AST_NODE_TYPES } = require('@typescript-eslint/utils');
+
+const createRule = ESLintUtils.RuleCreator(
+  (name) => `https://github.com/grafana/grafana/blob/main/packages/grafana-eslint-rules/README.md#${name}`
+);
+
+/**
+ * @param {string} title
+ * @returns {boolean}
+ */
+const isValidStorybookTitle = (title) => {
+  if (typeof title !== 'string') {
+    return true; // Skip non-string titles
+  }
+
+  const sections = title.split('/');
+
+  // Allow up to 3 sections if one of them is 'Deprecated'
+  if (sections.some((section) => section.trim() === 'Deprecated')) {
+    return sections.length <= 3;
+  }
+
+  // Otherwise, limit to maximum 2 sections (1 slash)
+  return sections.length <= 2;
+};
+
+/**
+ * @param {import('@typescript-eslint/utils').TSESTree.ObjectExpression} objectNode
+ * @param {import('@typescript-eslint/utils/ts-eslint').RuleContext<'invalidTitle', []>} context
+ */
+const checkObjectForTitle = (objectNode, context) => {
+  const titleProperty = objectNode.properties.find(
+    (prop) =>
+      prop.type === AST_NODE_TYPES.Property && prop.key.type === AST_NODE_TYPES.Identifier && prop.key.name === 'title'
+  );
+
+  if (
+    titleProperty &&
+    titleProperty.type === AST_NODE_TYPES.Property &&
+    titleProperty.value.type === AST_NODE_TYPES.Literal
+  ) {
+    const titleValue = titleProperty.value.value;
+
+    if (typeof titleValue === 'string' && !isValidStorybookTitle(titleValue)) {
+      context.report({
+        node: titleProperty.value,
+        messageId: 'invalidTitle',
+        data: {
+          title: titleValue,
+        },
+      });
+    }
+  }
+};
+
+const consistentStoryTitlesRule = createRule({
+  create(context) {
+    return {
+      ExportDefaultDeclaration(node) {
+        // Only check .story.tsx files
+        const filename = context.filename;
+        if (!filename || !filename.endsWith('.story.tsx')) {
+          return;
+        }
+
+        if (node.declaration.type === AST_NODE_TYPES.ObjectExpression) {
+          // Handle direct object export: export default { title: '...' }
+          checkObjectForTitle(node.declaration, context);
+        } else if (node.declaration.type === AST_NODE_TYPES.Identifier) {
+          // Handle variable reference export: export default storyConfig
+          const variableName = node.declaration.name;
+          const scope = context.sourceCode.getScope(node);
+          const variable = scope.set.get(variableName);
+
+          if (variable) {
+            // Find the variable declaration
+            const declaration = variable.defs.find((def) => def.type === 'Variable');
+            if (
+              declaration &&
+              declaration.node.init &&
+              declaration.node.init.type === AST_NODE_TYPES.ObjectExpression
+            ) {
+              checkObjectForTitle(declaration.node.init, context);
+            }
+          }
+        }
+      },
+    };
+  },
+  name: 'consistent-story-titles',
+  meta: {
+    type: 'problem',
+    docs: {
+      description: 'Enforce consistent Storybook titles with maximum two sections (1 slash) unless one is "Deprecated"',
+    },
+    messages: {
+      invalidTitle:
+        'Storybook title "{{ title }}" has too many sections. Use maximum 2 sections (1 slash) unless one section is "Deprecated".',
+    },
+    schema: [],
+  },
+  defaultOptions: [],
+});
+
+module.exports = consistentStoryTitlesRule;
diff --git a/packages/grafana-eslint-rules/tests/consistent-stories.test.js b/packages/grafana-eslint-rules/tests/consistent-stories.test.js
new file mode 100644
index 00000000000..004cd0aeeb3
--- /dev/null
+++ b/packages/grafana-eslint-rules/tests/consistent-stories.test.js
@@ -0,0 +1,117 @@
+import { RuleTester } from 'eslint';
+
+import consistentStories from '../rules/consistent-story-titles.cjs';
+
+RuleTester.setDefaultConfig({
+  languageOptions: {
+    ecmaVersion: 2018,
+    sourceType: 'module',
+    parserOptions: {
+      ecmaFeatures: {
+        jsx: true,
+      },
+    },
+  },
+});
+
+const ruleTester = new RuleTester();
+
+ruleTester.run('eslint consistent-stories', consistentStories, {
+  valid: [
+    {
+      name: 'simple title',
+      code: `export default { title: 'Button' };`,
+      filename: 'Button.story.tsx',
+    },
+    {
+      name: 'one section',
+      code: `export default { title: 'Components/Button' };`,
+      filename: 'Button.story.tsx',
+    },
+    {
+      name: 'deprecated can have 3 sections',
+      code: `export default { title: 'Components/Deprecated/Button' };`,
+      filename: 'Button.story.tsx',
+    },
+    {
+      name: 'not a story file',
+      code: `export default { title: 'Components/Forms/Button/Extra/Section' };`,
+      filename: 'Button.tsx',
+    },
+    {
+      name: 'non-string title',
+      code: `export default { title: 123 };`,
+      filename: 'Button.story.tsx',
+    },
+    {
+      name: 'no title property',
+      code: `export default { component: Button };`,
+      filename: 'Button.story.tsx',
+    },
+    {
+      name: 'variable assignment - simple title',
+      code: `
+const storyConfig = { title: 'Button' };
+export default storyConfig;`,
+      filename: 'Button.story.tsx',
+    },
+    {
+      name: 'variable assignment - one section',
+      code: `
+const storyConfig = { title: 'Components/Button' };
+export default storyConfig;`,
+      filename: 'Button.story.tsx',
+    },
+    {
+      name: 'variable assignment - with Deprecated',
+      code: `
+const storyConfig = { title: 'Components/Deprecated/Button' };
+export default storyConfig;`,
+      filename: 'Button.story.tsx',
+    },
+  ],
+  invalid: [
+    {
+      name: 'too many sections without Deprecated',
+      code: `export default { title: 'Components/Forms/Button' };`,
+      filename: 'Button.story.tsx',
+      errors: [
+        {
+          messageId: 'invalidTitle',
+        },
+      ],
+    },
+    {
+      name: 'too many sections without Deprecated',
+      code: `export default { title: 'Components/Forms/Button/Extra' };`,
+      filename: 'Button.story.tsx',
+      errors: [
+        {
+          messageId: 'invalidTitle',
+        },
+      ],
+    },
+    {
+      name: 'with spaces around sections',
+      code: `export default { title: 'Components / Forms / Button' };`,
+      filename: 'Button.story.tsx',
+      errors: [
+        {
+          messageId: 'invalidTitle',
+        },
+      ],
+    },
+    {
+      name: 'variable assignment - too many sections',
+      code: `
+const storyConfig = { title: 'Components/Forms/Button' };
+export default storyConfig;`,
+      filename: 'Button.story.tsx',
+      errors: [
+        {
+          messageId: 'invalidTitle',
+        },
+      ],
+    },
+  ],
+});
diff --git a/packages/grafana-ui/.storybook/main.ts b/packages/grafana-ui/.storybook/main.ts
index 1c75daef688..29258c4a228 100644
--- a/packages/grafana-ui/.storybook/main.ts
+++ b/packages/grafana-ui/.storybook/main.ts
@@ -2,13 +2,7 @@ import path, { dirname, join } from 'node:path';
 import type { StorybookConfig } from '@storybook/react-webpack5';
 import { copyAssetsSync } from './copyAssets';
 
-// Internal stories should only be visible during development
-const coreComponentsGlobs: StorybookConfig['stories'] = [
-  '../src/Intro.mdx',
-  process.env.NODE_ENV === 'production'
-    ? '../src/components/**/!(*.internal).story.tsx'
-    : '../src/components/**/*.story.tsx',
-];
+const coreComponentsGlobs: StorybookConfig['stories'] = ['../src/Intro.mdx', '../src/**/*.story.tsx'];
 
 const alertingComponentsGlobs: StorybookConfig['stories'] = [
   {
diff --git a/packages/grafana-ui/.storybook/preview.ts b/packages/grafana-ui/.storybook/preview.ts
index 93892fae443..803d45315e3 100644
--- a/packages/grafana-ui/.storybook/preview.ts
+++ b/packages/grafana-ui/.storybook/preview.ts
@@ -71,20 +71,84 @@ const preview: Preview = {
       // Sort stories first by Docs Overview, then alphabetically
       // We should be able to use the builtin alphabetical sort, but is broken in SB 7.0
       // https://github.com/storybookjs/storybook/issues/22470
+
+      // Story sorting is weird - All stories are sorted as a single 1D list, but then grouped in the UI.
+      // Story titles are generally in the format of [Category]/[Component]/[Story]. However, some categories
+      // will have an additional `Deprecated` sub folder before the [Component]
+      //
+      // We want to have multi-level sorting where:
+      // - The top level category has an explicit order
+      // - Components are sorted alphabetically within their category
+      //   - Except the Deprecated folder, which is sorted to the bottom
+      // - Stories per component use the default file sort order
       storySort: (a, b) => {
-        // Skip sorting for stories with nosort tag
-        if (a.tags.includes('nosort') || b.tags.includes('nosort')) {
-          return 0;
+        const CATEGORY_ORDER = [
+          // Should all be lowercase
+          'docs overview',
+          'foundations',
+          'iconography',
+          'layout',
+
+          'forms',
+          'inputs',
+          'pickers',
+          'date time pickers',
+
+          'information',
+          'overlays',
+          'utilities',
+          'navigation',
+
+          'plugins',
+          'alerting',
+          'developers',
+        ];
+
+        const aTitle = a.title.toLowerCase();
+        const bTitle = b.title.toLowerCase();
+        const [aCategory, aComponent] = aTitle.split('/');
+        const [bCategory, bComponent] = bTitle.split('/');
+
+        //
+        // Sort by category order first
+        const aCategoryIndex = CATEGORY_ORDER.indexOf(aCategory);
+        const bCategoryIndex = CATEGORY_ORDER.indexOf(bCategory);
+
+        if (aCategoryIndex === -1 || bCategoryIndex === -1) {
+          const category = aCategoryIndex === -1 ? aCategory : bCategory;
+          throw new Error(
+            `Category ${category} not found in CATEGORY_ORDER. Prefer reusing the existing categories, or add to CATEGORY_ORDER.`
+          );
         }
-        if (a.title.startsWith('Docs Overview')) {
-          if (b.title.startsWith('Docs Overview')) {
-            return 0;
-          }
+
+        if (aCategoryIndex !== bCategoryIndex) {
+          return aCategoryIndex - bCategoryIndex;
+        }
+
+        //
+        // Sort 'Deprecated' subfolders to the bottom
+        if (aTitle.includes('deprecated') && !bTitle.includes('deprecated')) {
+          return 1;
+        } else if (bTitle.includes('deprecated') && !aTitle.includes('deprecated')) {
           return -1;
-        } else if (b.title.startsWith('Docs Overview')) {
+        }
+
+        //
+        // Sort Docs to the top
+        if (a.type === 'docs' && b.type !== 'docs') {
+          return -1;
+        } else if (a.type !== 'docs' && b.type === 'docs') {
           return 1;
         }
-        return a.id === b.id ? 0 : a.id.localeCompare(b.id, undefined, { numeric: true });
+
+        //
+        // If sorting different components, sort alphabetically
+        if (aComponent !== bComponent) {
+          return aComponent.localeCompare(bComponent, undefined, { numeric: true });
+        }
+
+        // Otherwise, sort stories within componmments according to source order
+        return 0;
       },
     },
   },
diff --git a/packages/grafana-ui/src/components/Alert/InlineBanner.story.tsx b/packages/grafana-ui/src/components/Alert/Alert.story.tsx
similarity index 87%
rename from packages/grafana-ui/src/components/Alert/InlineBanner.story.tsx
rename to packages/grafana-ui/src/components/Alert/Alert.story.tsx
index 61d573d0f1f..2c5ffba4f06 100644
--- a/packages/grafana-ui/src/components/Alert/InlineBanner.story.tsx
+++ b/packages/grafana-ui/src/components/Alert/Alert.story.tsx
@@ -10,7 +10,7 @@ import mdx from './Alert.mdx';
 const severities: AlertVariant[] = ['error', 'warning', 'info', 'success'];
 
 const meta: Meta = {
-  title: 'Overlays/Alert/InlineBanner',
+  title: 'Information/Alert',
   component: Alert,
   parameters: {
     docs: {
@@ -78,4 +78,15 @@ export const Examples: StoryFn<typeof Alert> = () => {
   );
 };
 
+export const Toast: StoryFn<typeof Alert> = (args) => {
+  return <Alert {...args}>To use as a toast, set the elevated and onRemove props.</Alert>;
+};
+
+Toast.args = {
+  title: 'Toast',
+  severity: 'error',
+  onRemove: action('Remove button clicked'),
+  elevated: true,
+};
+
 export default meta;
diff --git a/packages/grafana-ui/src/components/Alert/Toast.story.tsx b/packages/grafana-ui/src/components/Alert/Toast.story.tsx
deleted file mode 100644
index 12991adcb03..00000000000
--- a/packages/grafana-ui/src/components/Alert/Toast.story.tsx
+++ /dev/null
@@ -1,126 +0,0 @@
-import { action } from '@storybook/addon-actions';
-import { StoryFn, Meta } from '@storybook/react';
-
-import { StoryExample } from '../../utils/storybook/StoryExample';
-import { Stack } from '../Layout/Stack/Stack';
-
-import { Alert, AlertVariant } from './Alert';
-import mdx from './Alert.mdx';
-
-const severities: AlertVariant[] = ['error', 'warning', 'info', 'success'];
-
-const meta: Meta<typeof Alert> = {
-  title: 'Overlays/Alert/Toast',
-  component: Alert,
-  parameters: {
-    docs: {
-      page: mdx,
-    },
-    controls: { exclude: ['onRemove'] },
-  },
-  argTypes: {
-    severity: { control: { type: 'select', options: severities } },
-  },
-  args: {
-    title: 'Toast',
-    severity: 'error',
-    onRemove: action('Remove button clicked'),
-  },
-};
-
-export const Basic: StoryFn<typeof Alert> = (args) => {
-  return (
-    <Alert {...args} elevated>
-      Child content that includes some alert details, like maybe what actually happened.
-    </Alert>
-  );
-};
-
-export function Examples() {
-  return (
-    <Stack direction="column">
-      <StoryExample name="Severities">
-        <Stack direction="column">
-          {severities.map((severity) => (
-            <Alert
-              title={`Severity: ${severity}`}
-              severity={severity}
-              key={severity}
-              onRemove={action('Remove button clicked')}
-              elevated={true}
-            />
-          ))}
-        </Stack>
-      </StoryExample>
-      <StoryExample name="With huge payload">
-        <Alert title="Alert with huge payload" severity="error" elevated={true}>
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam metus urna, aliquam eu scelerisque non,
-          facilisis eget est. Morbi eleifend egestas massa id vulputate. Fusce dignissim magna lacus, ut molestie odio
-          feugiat sed. Cras fringilla justo sit amet turpis scelerisque, a volutpat purus iaculis. Nunc sagittis
-          molestie faucibus. Curabitur at neque luctus, pellentesque urna eget, posuere urna. Nunc malesuada elit in
-          ipsum dictum egestas. Praesent convallis mauris massa, porta mattis ex gravida ut. Proin consectetur ultrices
-          tortor sit amet efficitur. Suspendisse nec turpis dapibus mauris venenatis maximus quis eget orci. Ut semper
-          enim magna, ullamcorper elementum sapien pharetra vitae. Vivamus at nulla ut metus bibendum ornare et ut leo.
-          Proin ante turpis, ornare a malesuada et, rutrum nec lorem. Maecenas vestibulum orci vel nibh convallis
-          eleifend. Quisque vitae consectetur massa, vitae elementum mauris. Pellentesque sit amet ligula lorem. Fusce
-          sit amet lorem non augue rutrum varius. Donec sed imperdiet libero, eget venenatis elit. Fusce porttitor
-          dapibus urna. Duis fringilla ante vel tempor tincidunt. In euismod vestibulum odio sit amet iaculis. Donec vel
-          dapibus libero. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi lacinia commodo lectus. Aenean
-          in magna eget lectus luctus suscipit et vitae erat. Pellentesque quis ligula id lorem egestas sollicitudin sit
-          amet sed sem. Nullam et nibh a odio rhoncus efficitur sed nec est. Sed commodo lacus vitae sem congue,
-          accumsan dignissim metus iaculis. Praesent in dignissim nisl. Aliquam facilisis, sapien eget porttitor
-          ultrices, massa libero bibendum odio, at ornare diam arcu ac massa. Vestibulum egestas leo eget lorem congue
-          condimentum. Praesent egestas, neque id gravida vehicula, augue ex scelerisque lectus, finibus pellentesque
-          enim dolor vel ante. Cras convallis, sem at malesuada tincidunt, diam urna auctor leo, sed laoreet est ex in
-          libero. Ut condimentum ante eget ex gravida, id tempus metus ultricies. Pellentesque placerat, massa id
-          laoreet molestie, justo nisl varius metus, maximus vehicula erat libero vitae nulla. Mauris rhoncus ligula
-          vitae volutpat auctor. Suspendisse potenti. Quisque quis orci faucibus, ullamcorper dolor eget, mollis massa.
-          Etiam eu molestie ipsum. Sed laoreet diam metus, luctus maximus erat viverra quis. Ut eu felis dictum,
-          tincidunt erat sit amet, scelerisque neque. Orci varius natoque penatibus et magnis dis parturient montes,
-          nascetur ridiculus mus. Phasellus sit amet est tristique, fermentum massa ut, viverra metus. Interdum et
-          malesuada fames ac ante ipsum primis in faucibus. Nunc iaculis nunc elit, ut feugiat ipsum egestas eget.
-          Vestibulum pulvinar ligula mi, quis lacinia diam suscipit eget. Etiam consectetur vel nunc at hendrerit.
-          Pellentesque blandit eleifend aliquam. Etiam et malesuada purus, et bibendum sapien. Phasellus tincidunt
-          consequat eros consequat sodales. Vestibulum quis viverra neque. Integer sit amet lacinia nunc. Ut cursus,
-          elit id faucibus elementum, elit nunc dapibus tellus, non ornare nisi sapien et eros. Nunc sit amet suscipit
-          arcu. Nulla ut nunc tempor, auctor massa sed, consectetur orci. Pellentesque erat ante, placerat eget dictum
-          elementum, dapibus et ipsum. Nunc sit amet nulla gravida, finibus felis vel, tempus sem. In urna purus,
-          accumsan quis aliquam et, condimentum ac urna. Nullam volutpat ullamcorper sapien, quis ultricies purus
-          dignissim aliquam. Mauris quis enim ante. Etiam vulputate faucibus placerat. Ut pellentesque, purus vitae
-          euismod cursus, lacus enim vulputate sapien, in porttitor erat dui eu lectus. Duis eleifend, massa vel
-          vehicula gravida, magna urna rutrum ligula, vitae mollis ipsum neque id enim. Donec varius tristique nisi, et
-          vestibulum dolor efficitur eget. Cras mauris leo, bibendum eget pretium a, tincidunt faucibus massa.
-          Vestibulum hendrerit arcu magna, vel consequat est euismod nec. Vestibulum non lacus porttitor, congue tortor
-          ut, venenatis elit. Duis at lectus arcu. Nunc quis sapien eu ipsum rutrum accumsan. Orci varius natoque
-          penatibus et magnis dis parturient montes, nascetur ridiculus mus. Vivamus quis sapien luctus, volutpat nulla
-          eget, gravida nunc. Aenean placerat a felis quis imperdiet. Sed sapien tellus, ultrices non ipsum eget,
-          pretium rhoncus quam. Aliquam erat volutpat. Maecenas at interdum turpis, eu mattis ligula. Class aptent
-          taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. In lobortis felis a leo
-          ultricies, venenatis mollis felis lobortis. Suspendisse placerat vel ante vel euismod. Aenean sit amet
-          ullamcorper mauris, id consectetur est. Ut ultricies enim non quam condimentum, et congue arcu commodo.
-          Praesent convallis eleifend turpis, vitae feugiat turpis imperdiet sit amet. Class aptent taciti sociosqu ad
-          litora torquent per conubia nostra, per inceptos himenaeos. Quisque vulputate porttitor mattis. Pellentesque
-          sed ullamcorper lectus. Suspendisse velit tortor, viverra eget facilisis condimentum, accumsan sit amet felis.
-          Cras lobortis mi fermentum ligula consectetur, vitae tincidunt mauris scelerisque. Aenean ac condimentum erat,
-          quis lacinia lacus. Ut magna nibh, tempor et ligula suscipit, placerat laoreet ipsum. In semper semper nisl.
-          Donec risus lorem, tempor sed sollicitudin vitae, fringilla et mi. Vivamus pulvinar quam nisl, et tincidunt
-          justo tempus quis. Duis semper magna nunc, vitae faucibus lectus facilisis sed. Phasellus consequat arcu vel
-          interdum fermentum. In condimentum euismod neque, sed aliquet mauris posuere nec. Etiam metus eros,
-          pellentesque eget scelerisque id, porttitor at ligula. Curabitur eget nibh maximus enim lobortis sodales.
-          Etiam vulputate ligula lobortis vestibulum pulvinar. Curabitur eros justo, accumsan sed elit ac, mattis
-          lacinia nisi. Suspendisse ullamcorper lectus sit amet tellus condimentum porttitor. Duis cursus, neque et
-          aliquam congue, odio lectus porta elit, id lacinia dolor justo non leo. Aliquam vehicula at tellus ullamcorper
-          tincidunt. Phasellus neque nibh, convallis sit amet arcu sit amet, convallis egestas tortor. Etiam sit amet
-          vehicula quam. Praesent id consequat lacus, ac facilisis quam. Integer tristique lorem eros, id consequat
-          lorem lobortis vitae. Aliquam luctus purus eget sem molestie iaculis. Duis nisl risus, sodales sit amet nunc
-          vitae, volutpat cursus augue. Pellentesque congue massa eu metus pellentesque consectetur at vel neque. Donec
-          bibendum hendrerit erat, vitae dictum enim lobortis a. Quisque ac dapibus tellus, sit amet facilisis orci.
-          Cras pretium tortor non condimentum semper. Phasellus mollis condimentum blandit. Pellentesque at arcu risus.
-          Vivamus sit amet dui semper, suscipit est nec, elementum arcu. Praesent ante turpis, convallis ac leo eget,
-        </Alert>
-      </StoryExample>
-    </Stack>
-  );
-}
-
-export default meta;
diff --git a/packages/grafana-ui/src/components/AutoSaveField/AutoSaveField.story.tsx b/packages/grafana-ui/src/components/AutoSaveField/AutoSaveField.story.tsx
index 1f033fcf69c..eb6cb427eba 100644
--- a/packages/grafana-ui/src/components/AutoSaveField/AutoSaveField.story.tsx
+++ b/packages/grafana-ui/src/components/AutoSaveField/AutoSaveField.story.tsx
@@ -12,7 +12,7 @@ import { AutoSaveField } from './AutoSaveField';
 import mdx from './AutoSaveField.mdx';
 
 const meta: Meta = {
-  title: 'Forms/AutoSaveField',
+  title: 'Inputs/AutoSaveField',
   component: AutoSaveField,
   parameters: {
     docs: {
diff --git a/packages/grafana-ui/src/components/Badge/Badge.story.tsx b/packages/grafana-ui/src/components/Badge/Badge.story.tsx
index 173ba2ab36d..69ee4c37d94 100644
--- a/packages/grafana-ui/src/components/Badge/Badge.story.tsx
+++ b/packages/grafana-ui/src/components/Badge/Badge.story.tsx
@@ -6,7 +6,7 @@ import { Badge } from './Badge';
 import mdx from './Badge.mdx';
 
 const meta: Meta<typeof Badge> = {
-  title: 'Data Display/Badge',
+  title: 'Information/Badge',
   component: Badge,
   parameters: {
     docs: { page: mdx },
diff --git a/packages/grafana-ui/src/components/BarGauge/BarGauge.story.tsx b/packages/grafana-ui/src/components/BarGauge/BarGauge.story.tsx
index 4c5575563d0..f5f42236828 100644
--- a/packages/grafana-ui/src/components/BarGauge/BarGauge.story.tsx
+++ b/packages/grafana-ui/src/components/BarGauge/BarGauge.story.tsx
@@ -9,7 +9,7 @@ import { BarGauge, Props } from './BarGauge';
 import mdx from './BarGauge.mdx';
 
 const meta: Meta = {
-  title: 'Visualizations/BarGauge',
+  title: 'Plugins/BarGauge',
   component: BarGauge,
   parameters: {
     docs: {
diff --git a/packages/grafana-ui/src/components/BigValue/BigValue.story.tsx b/packages/grafana-ui/src/components/BigValue/BigValue.story.tsx
index 816a377b25a..48c45f9843c 100644
--- a/packages/grafana-ui/src/components/BigValue/BigValue.story.tsx
+++ b/packages/grafana-ui/src/components/BigValue/BigValue.story.tsx
@@ -15,7 +15,7 @@ import {
 import mdx from './BigValue.mdx';
 
 const meta: Meta = {
-  title: 'Visualizations/BigValue',
+  title: 'Plugins/BigValue',
   component: BigValue,
   parameters: {
     docs: {
diff --git a/packages/grafana-ui/src/components/Button/Button.story.tsx b/packages/grafana-ui/src/components/Button/Button.story.tsx
index c87d6709567..5f26875852e 100644
--- a/packages/grafana-ui/src/components/Button/Button.story.tsx
+++ b/packages/grafana-ui/src/components/Button/Button.story.tsx
@@ -12,7 +12,7 @@ import { ButtonGroup } from './ButtonGroup';
 const sizes: ComponentSize[] = ['lg', 'md', 'sm'];
 
 export default {
-  title: 'Buttons/Button',
+  title: 'Inputs/Button',
   component: Button,
   parameters: {
     docs: {
diff --git a/packages/grafana-ui/src/components/ButtonCascader/ButtonCascader.story.tsx b/packages/grafana-ui/src/components/ButtonCascader/ButtonCascader.story.tsx
index edb861bbfad..b9870ad11b2 100644
--- a/packages/grafana-ui/src/components/ButtonCascader/ButtonCascader.story.tsx
+++ b/packages/grafana-ui/src/components/ButtonCascader/ButtonCascader.story.tsx
@@ -3,7 +3,7 @@ import { StoryFn, Meta } from '@storybook/react';
 import { ButtonCascader } from './ButtonCascader';
 
 const meta: Meta<typeof ButtonCascader> = {
-  title: 'Forms/Cascader/ButtonCascader',
+  title: 'Inputs/ButtonCascader',
   component: ButtonCascader,
   parameters: {
     controls: {
diff --git a/packages/grafana-ui/src/components/CallToActionCard/CallToActionCard.internal.story.tsx b/packages/grafana-ui/src/components/CallToActionCard/CallToActionCard.story.tsx
similarity index 96%
rename from packages/grafana-ui/src/components/CallToActionCard/CallToActionCard.internal.story.tsx
rename to packages/grafana-ui/src/components/CallToActionCard/CallToActionCard.story.tsx
index 5d42373e1cc..8c107a20129 100644
--- a/packages/grafana-ui/src/components/CallToActionCard/CallToActionCard.internal.story.tsx
+++ b/packages/grafana-ui/src/components/CallToActionCard/CallToActionCard.story.tsx
@@ -6,7 +6,7 @@ import { Button } from '../Button/Button';
 import { CallToActionCard, CallToActionCardProps } from './CallToActionCard';
 
 const meta: Meta = {
-  title: 'Layout/CallToActionCard',
+  title: 'Information/Deprecated/CallToActionCard',
   component: CallToActionCard,
   parameters: {
     controls: {
diff --git a/packages/grafana-ui/src/components/CallToActionCard/CallToActionCard.tsx b/packages/grafana-ui/src/components/CallToActionCard/CallToActionCard.tsx
index e71c688f3e7..ca3348c2b54 100644
--- a/packages/grafana-ui/src/components/CallToActionCard/CallToActionCard.tsx
+++ b/packages/grafana-ui/src/components/CallToActionCard/CallToActionCard.tsx
@@ -11,6 +11,7 @@ export interface CallToActionCardProps {
   className?: string;
 }
 
+/** @deprecated Use <EmptyState variant="call-to-action" /> instead */
 export const CallToActionCard = ({ message, callToActionElement, footer, className }: CallToActionCardProps) => {
   const css = useStyles2(getStyles);
 
diff --git a/packages/grafana-ui/src/components/Card/Card.story.tsx b/packages/grafana-ui/src/components/Card/Card.story.tsx
index 8f2a9668dd2..34b25d96a05 100644
--- a/packages/grafana-ui/src/components/Card/Card.story.tsx
+++ b/packages/grafana-ui/src/components/Card/Card.story.tsx
@@ -9,10 +9,9 @@ import { Card } from './Card';
 const logo = 'https://grafana.com/static/assets/img/apple-touch-icon.png';
 
 const meta: Meta<typeof Card> = {
-  title: 'General/Card',
+  title: 'Layout/Card',
   component: Card,
-  // nosort is a custom tag used so the stories shown in docs keep the order they are defined in the file
-  tags: ['autodocs', 'nosort'],
+  tags: ['autodocs'],
   parameters: {
     controls: {
       exclude: ['onClick', 'href', 'heading', 'description', 'className', 'noMargin'],
diff --git a/packages/grafana-ui/src/components/Carousel/Carousel.story.tsx b/packages/grafana-ui/src/components/Carousel/Carousel.story.tsx
index ffed8b27098..33a2c762582 100644
--- a/packages/grafana-ui/src/components/Carousel/Carousel.story.tsx
+++ b/packages/grafana-ui/src/components/Carousel/Carousel.story.tsx
@@ -15,7 +15,7 @@ const sampleImages = [
 ];
 
 const meta: Meta<typeof Carousel> = {
-  title: 'Data Display/Carousel',
+  title: 'Overlays/Carousel',
   component: Carousel,
   parameters: {
     docs: { page: mdx },
diff --git a/packages/grafana-ui/src/components/Cascader/Cascader.story.tsx b/packages/grafana-ui/src/components/Cascader/Cascader.story.tsx
index 43d8c337589..761235d5a22 100644
--- a/packages/grafana-ui/src/components/Cascader/Cascader.story.tsx
+++ b/packages/grafana-ui/src/components/Cascader/Cascader.story.tsx
@@ -31,7 +31,7 @@ const options = [
 ];
 
 const meta: Meta<typeof Cascader> = {
-  title: 'Forms/Cascader',
+  title: 'Inputs/Cascader',
   component: Cascader,
   parameters: {
     docs: {
diff --git a/packages/grafana-ui/src/components/ClickOutsideWrapper/ClickOutsideWrapper.story.tsx b/packages/grafana-ui/src/components/ClickOutsideWrapper/ClickOutsideWrapper.story.tsx
index c2fc4d41a24..53f56e7d128 100644
--- a/packages/grafana-ui/src/components/ClickOutsideWrapper/ClickOutsideWrapper.story.tsx
+++ b/packages/grafana-ui/src/components/ClickOutsideWrapper/ClickOutsideWrapper.story.tsx
@@ -5,7 +5,7 @@ import { ClickOutsideWrapper } from './ClickOutsideWrapper';
 import mdx from './ClickOutsideWrapper.mdx';
 
 const meta: Meta<typeof ClickOutsideWrapper> = {
-  title: 'Layout/ClickOutsideWrapper',
+  title: 'Utilities/ClickOutsideWrapper',
   component: ClickOutsideWrapper,
   parameters: {
     docs: {
diff --git a/packages/grafana-ui/src/components/ClipboardButton/ClipboardButton.story.tsx b/packages/grafana-ui/src/components/ClipboardButton/ClipboardButton.story.tsx
index 5089786ae97..64c0489590a 100644
--- a/packages/grafana-ui/src/components/ClipboardButton/ClipboardButton.story.tsx
+++ b/packages/grafana-ui/src/components/ClipboardButton/ClipboardButton.story.tsx
@@ -7,7 +7,7 @@ import { ClipboardButton as ClipboardButtonImpl, Props } from './ClipboardButton
 import mdx from './ClipboardButton.mdx';
 
 const meta: Meta = {
-  title: 'Buttons/ClipboardButton',
+  title: 'Inputs/ClipboardButton',
   component: ClipboardButtonImpl,
   parameters: {
     docs: {
diff --git a/packages/grafana-ui/src/components/ColorPicker/ColorPicker.story.tsx b/packages/grafana-ui/src/components/ColorPicker/ColorPicker.story.tsx
index 196c8d65c97..c3967136503 100644
--- a/packages/grafana-ui/src/components/ColorPicker/ColorPicker.story.tsx
+++ b/packages/grafana-ui/src/components/ColorPicker/ColorPicker.story.tsx
@@ -5,12 +5,11 @@ import { Meta, StoryFn } from '@storybook/react';
 import { useStyles2 } from '../../themes/ThemeContext';
 import { clearButtonStyles } from '../Button/Button';
 
-import { ColorPicker, SeriesColorPicker } from './ColorPicker';
+import { ColorPicker } from './ColorPicker';
 import mdx from './ColorPicker.mdx';
-import { ColorPickerInput } from './ColorPickerInput';
 
 const meta: Meta<typeof ColorPicker> = {
-  title: 'Pickers and Editors/ColorPicker',
+  title: 'Pickers/ColorPicker',
   component: ColorPicker,
   parameters: {
     docs: {
@@ -43,24 +42,6 @@ export const Basic: StoryFn<typeof ColorPicker> = ({ color, enableNamedColors })
   );
 };
 
-export const SeriesPicker: StoryFn<typeof SeriesColorPicker> = ({ color, enableNamedColors }) => {
-  const [, updateArgs] = useArgs();
-  return (
-    <div style={{ display: 'flex', alignItems: 'flex-start' }}>
-      <SeriesColorPicker
-        enableNamedColors={enableNamedColors}
-        yaxis={1}
-        onToggleAxis={() => {}}
-        color={color}
-        onChange={(color) => {
-          action('Color changed')(color);
-          updateArgs({ color });
-        }}
-      />
-    </div>
-  );
-};
-
 export const CustomTrigger: StoryFn<typeof ColorPicker> = ({ color, enableNamedColors }) => {
   const [, updateArgs] = useArgs();
   const clearButton = useStyles2(clearButtonStyles);
@@ -89,19 +70,4 @@ export const CustomTrigger: StoryFn<typeof ColorPicker> = ({ color, enableNamedC
   );
 };
 
-export const Input: StoryFn<typeof ColorPickerInput> = ({ color }) => {
-  const [, updateArgs] = useArgs();
-  return (
-    <div style={{ minHeight: '100dvh', display: 'grid', placeContent: 'center' }}>
-      <ColorPickerInput
-        value={color}
-        onChange={(color) => {
-          action('Color changed')(color);
-          updateArgs({ color });
-        }}
-      />
-    </div>
-  );
-};
-
 export default meta;
diff --git a/packages/grafana-ui/src/components/ColorPicker/ColorPickerInput.story.tsx b/packages/grafana-ui/src/components/ColorPicker/ColorPickerInput.story.tsx
new file mode 100644
index 00000000000..0be0684ca33
--- /dev/null
+++ b/packages/grafana-ui/src/components/ColorPicker/ColorPickerInput.story.tsx
@@ -0,0 +1,32 @@
+import { action } from '@storybook/addon-actions';
+import { useArgs } from '@storybook/preview-api';
+import { Meta, StoryFn } from '@storybook/react';
+
+import { ColorPickerInput } from './ColorPickerInput';
+
+const meta: Meta<typeof ColorPickerInput> = {
+  title: 'Pickers/ColorPickerInput',
+  component: ColorPickerInput,
+  parameters: {
+    controls: {
+      exclude: ['onChange', 'onColorChange'],
+    },
+  },
+};
+
+export const Basic: StoryFn<typeof ColorPickerInput> = ({ color }) => {
+  const [, updateArgs] = useArgs();
+  return (
+    <div style={{ minHeight: '100dvh', display: 'grid', placeContent: 'center' }}>
+      <ColorPickerInput
+        value={color}
+        onChange={(color) => {
+          action('Color changed')(color);
+          updateArgs({ color });
+        }}
+      />
+    </div>
+  );
+};
+
+export default meta;
diff --git a/packages/grafana-ui/src/components/ColorPicker/ColorPickerPopover.story.tsx b/packages/grafana-ui/src/components/ColorPicker/ColorPickerPopover.story.tsx
deleted file mode 100644
index a8ffbc6d129..00000000000
--- a/packages/grafana-ui/src/components/ColorPicker/ColorPickerPopover.story.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-import { Meta } from '@storybook/react';
-import { useState } from 'react';
-
-import { useTheme2 } from '../../themes/ThemeContext';
-
-import mdx from './ColorPicker.mdx';
-import { ColorPickerPopover } from './ColorPickerPopover';
-import { SeriesColorPickerPopover } from './SeriesColorPickerPopover';
-
-const meta: Meta<typeof ColorPickerPopover> = {
-  title: 'Pickers and Editors/ColorPicker/Popovers',
-  component: ColorPickerPopover,
-  parameters: {
-    docs: {
-      page: mdx,
-    },
-  },
-};
-
-export const Basic = () => {
-  return (
-    <div style={{ position: 'absolute' }}>
-      <ColorPickerPopover
-        color="#BC67E6"
-        onChange={(color: string) => {
-          console.log(color);
-        }}
-      />
-    </div>
-  );
-};
-
-export const SeriesColorPickerPopoverExample = () => {
-  const theme = useTheme2();
-  const [yAxis, setYAxis] = useState(0);
-
-  return (
-    <div style={{ position: 'absolute' }}>
-      <SeriesColorPickerPopover
-        theme={theme}
-        yaxis={yAxis}
-        onToggleAxis={() => (yAxis ? setYAxis(0) : setYAxis(2))}
-        color="#BC67E6"
-        onChange={(color: string) => {
-          console.log(color);
-        }}
-      />
-    </div>
-  );
-};
-
-export default meta;
diff --git a/packages/grafana-ui/src/components/ColorPicker/Palettes.story.tsx b/packages/grafana-ui/src/components/ColorPicker/Palettes.story.tsx
deleted file mode 100644
index 06042a9a30d..00000000000
--- a/packages/grafana-ui/src/components/ColorPicker/Palettes.story.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import { action } from '@storybook/addon-actions';
-import { useArgs } from '@storybook/preview-api';
-import { Meta, StoryFn } from '@storybook/react';
-import { useState } from 'react';
-
-import mdx from './ColorPicker.mdx';
-import { NamedColorsPalette } from './NamedColorsPalette';
-import SpectrumPalette from './SpectrumPalette';
-
-const meta: Meta = {
-  title: 'Pickers and Editors/ColorPicker/Palettes',
-  parameters: {
-    docs: {
-      page: mdx,
-    },
-    controls: {
-      exclude: ['theme', 'color'],
-    },
-  },
-  args: {
-    color: 'green',
-  },
-};
-
-export const NamedColors: StoryFn<typeof NamedColorsPalette> = ({ color }) => {
-  const [colorVal, setColor] = useState(color);
-  return <NamedColorsPalette color={colorVal} onChange={setColor} />;
-};
-
-export const Spectrum: StoryFn<typeof SpectrumPalette> = ({ color }) => {
-  const [, updateArgs] = useArgs();
-  return (
-    <SpectrumPalette
-      color={color}
-      onChange={(color: string) => {
-        action('Color changed')(color);
-        updateArgs({ color });
-      }}
-    />
-  );
-};
-
-export default meta;
diff --git a/packages/grafana-ui/src/components/ColorPicker/SeriesColorPicker.story.tsx b/packages/grafana-ui/src/components/ColorPicker/SeriesColorPicker.story.tsx
new file mode 100644
index 00000000000..a66b0b951dd
--- /dev/null
+++ b/packages/grafana-ui/src/components/ColorPicker/SeriesColorPicker.story.tsx
@@ -0,0 +1,39 @@
+import { action } from '@storybook/addon-actions';
+import { useArgs } from '@storybook/preview-api';
+import { Meta, StoryFn } from '@storybook/react';
+
+import { SeriesColorPicker } from './ColorPicker';
+
+const meta: Meta<typeof SeriesColorPicker> = {
+  title: 'Pickers/SeriesColorPicker',
+  component: SeriesColorPicker,
+  parameters: {
+    controls: {
+      exclude: ['onChange', 'onColorChange'],
+    },
+  },
+  args: {
+    enableNamedColors: false,
+    color: '#00ff00',
+  },
+};
+
+export const Basic: StoryFn<typeof SeriesColorPicker> = ({ color, enableNamedColors }) => {
+  const [, updateArgs] = useArgs();
+  return (
+    <div style={{ display: 'flex', alignItems: 'flex-start' }}>
+      <SeriesColorPicker
+        enableNamedColors={enableNamedColors}
+        yaxis={1}
+        onToggleAxis={() => {}}
+        color={color}
+        onChange={(color) => {
+          action('Color changed')(color);
+          updateArgs({ color });
+        }}
+      />
+    </div>
+  );
+};
+
+export default meta;
diff --git a/packages/grafana-ui/src/components/Combobox/Combobox.story.tsx b/packages/grafana-ui/src/components/Combobox/Combobox.story.tsx
index d8dc2ff2b7c..eea67016ada 100644
--- a/packages/grafana-ui/src/components/Combobox/Combobox.story.tsx
+++ b/packages/grafana-ui/src/components/Combobox/Combobox.story.tsx
@@ -16,7 +16,7 @@ type PropsAndCustomArgs<T extends string | number = string> = ComboboxProps<T> &
 type Story<T extends string | number = string> = StoryObj<PropsAndCustomArgs<T>>;
 
 const meta: Meta<PropsAndCustomArgs> = {
-  title: 'Forms/Combobox',
+  title: 'Inputs/Combobox',
   component: Combobox,
   parameters: {
     docs: {
diff --git a/packages/grafana-ui/src/components/Combobox/MultiCombobox.story.tsx b/packages/grafana-ui/src/components/Combobox/MultiCombobox.story.tsx
index 6c99190c64a..9456242aa8f 100644
--- a/packages/grafana-ui/src/components/Combobox/MultiCombobox.story.tsx
+++ b/packages/grafana-ui/src/components/Combobox/MultiCombobox.story.tsx
@@ -11,7 +11,7 @@ import { generateOptions, fakeSearchAPI, generateGroupingOptions } from './story
 import { ComboboxOption } from './types';
 
 const meta: Meta<typeof MultiCombobox> = {
-  title: 'Forms/MultiCombobox',
+  title: 'Inputs/MultiCombobox',
   component: MultiCombobox,
   parameters: {
     docs: {
diff --git a/packages/grafana-ui/src/components/ConfirmButton/ConfirmButton.story.tsx b/packages/grafana-ui/src/components/ConfirmButton/ConfirmButton.story.tsx
index 6d138a7cb90..106dfc19af6 100644
--- a/packages/grafana-ui/src/components/ConfirmButton/ConfirmButton.story.tsx
+++ b/packages/grafana-ui/src/components/ConfirmButton/ConfirmButton.story.tsx
@@ -8,7 +8,7 @@ import mdx from './ConfirmButton.mdx';
 import { DeleteButton } from './DeleteButton';
 
 const meta: Meta = {
-  title: 'Buttons/ConfirmButton',
+  title: 'Inputs/ConfirmButton',
   component: ConfirmButton,
   // SB7 has broken subcomponent types due to dropping support for the feature
   // https://github.com/storybookjs/storybook/issues/20782
diff --git a/packages/grafana-ui/src/components/ContextMenu/ContextMenu.mdx b/packages/grafana-ui/src/components/ContextMenu/ContextMenu.mdx
index 353636c7a21..a50659a3f0e 100644
--- a/packages/grafana-ui/src/components/ContextMenu/ContextMenu.mdx
+++ b/packages/grafana-ui/src/components/ContextMenu/ContextMenu.mdx
@@ -6,6 +6,8 @@ import { WithContextMenu } from './WithContextMenu';
 
 A menu displaying additional options when it's not possible to show them at all times due to a space constraint.
 
+`ContextMenu` wraps `Menu` to supply options as a list, and display at absolute coordinates.
+
 ### Usage
 
 There are controlled and uncontrolled versions of the component available. With the controlled component (`ContextMenu`) the open/close logic needs to be handled separately. Uncontrolled component (`WithContextMenu`) handles this logic internally.
diff --git a/packages/grafana-ui/src/components/ContextMenu/ContextMenu.story.tsx b/packages/grafana-ui/src/components/ContextMenu/ContextMenu.story.tsx
index 3834bccbedf..ebafcf95e03 100644
--- a/packages/grafana-ui/src/components/ContextMenu/ContextMenu.story.tsx
+++ b/packages/grafana-ui/src/components/ContextMenu/ContextMenu.story.tsx
@@ -10,7 +10,7 @@ import { renderMenuItems } from './ContextMenuStoryHelper';
 import { WithContextMenu, WithContextMenuProps } from './WithContextMenu';
 
 const meta: Meta<typeof ContextMenu> = {
-  title: 'General/ContextMenu',
+  title: 'Overlays/ContextMenu',
   component: ContextMenu,
   parameters: {
     docs: {
diff --git a/packages/grafana-ui/src/components/DataSourceSettings/DataSourceHttpSettings.story.tsx b/packages/grafana-ui/src/components/DataSourceSettings/DataSourceHttpSettings.story.tsx
index 3557ef84dd6..b198f976280 100644
--- a/packages/grafana-ui/src/components/DataSourceSettings/DataSourceHttpSettings.story.tsx
+++ b/packages/grafana-ui/src/components/DataSourceSettings/DataSourceHttpSettings.story.tsx
@@ -36,7 +36,7 @@ const settingsMock: HttpSettingsProps['dataSourceConfig'] = {
 };
 
 const meta: Meta<typeof DataSourceHttpSettings> = {
-  title: 'Data Source/DataSourceHttpSettings',
+  title: 'Plugins/DataSourceHttpSettings',
   component: DataSourceHttpSettings,
   parameters: {
     controls: {
diff --git a/packages/grafana-ui/src/components/DateTimePickers/DatePicker/DatePicker.story.tsx b/packages/grafana-ui/src/components/DateTimePickers/DatePicker/DatePicker.story.tsx
index 29b10d03148..3f12563318a 100644
--- a/packages/grafana-ui/src/components/DateTimePickers/DatePicker/DatePicker.story.tsx
+++ b/packages/grafana-ui/src/components/DateTimePickers/DatePicker/DatePicker.story.tsx
@@ -7,7 +7,7 @@ import { DatePicker, DatePickerProps } from './DatePicker';
 import mdx from './DatePicker.mdx';
 
 const meta: Meta<typeof DatePicker> = {
-  title: 'Pickers and Editors/TimePickers/Pickers And Editors/DatePicker',
+  title: 'Date time pickers/DatePicker',
   component: DatePicker,
   argTypes: {
     minDate: { control: 'date' },
diff --git a/packages/grafana-ui/src/components/DateTimePickers/DatePickerWithInput/DatePickerWithInput.story.tsx b/packages/grafana-ui/src/components/DateTimePickers/DatePickerWithInput/DatePickerWithInput.story.tsx
index 66b067846dd..158aa681b2d 100644
--- a/packages/grafana-ui/src/components/DateTimePickers/DatePickerWithInput/DatePickerWithInput.story.tsx
+++ b/packages/grafana-ui/src/components/DateTimePickers/DatePickerWithInput/DatePickerWithInput.story.tsx
@@ -13,7 +13,7 @@ const minimumDate = new Date();
 minimumDate.setMonth(minimumDate.getMonth() - 1);
 
 const meta: Meta<typeof DatePickerWithInput> = {
-  title: 'Pickers and Editors/TimePickers/DatePickerWithInput',
+  title: 'Date time pickers/DatePickerWithInput',
   component: DatePickerWithInput,
   parameters: {
     docs: {
diff --git a/packages/grafana-ui/src/components/DateTimePickers/DateTimePicker/DateTimePicker.story.tsx b/packages/grafana-ui/src/components/DateTimePickers/DateTimePicker/DateTimePicker.story.tsx
index a7a8d87961f..19acd203c0a 100644
--- a/packages/grafana-ui/src/components/DateTimePickers/DateTimePicker/DateTimePicker.story.tsx
+++ b/packages/grafana-ui/src/components/DateTimePickers/DateTimePicker/DateTimePicker.story.tsx
@@ -15,7 +15,7 @@ const minimumDate = new Date();
 minimumDate.setDate(minimumDate.getDate() - 7);
 
 const meta: Meta<typeof DateTimePicker> = {
-  title: 'Pickers and Editors/TimePickers/DateTimePicker',
+  title: 'Date time pickers/DateTimePicker',
   component: DateTimePicker,
   argTypes: {
     date: {
diff --git a/packages/grafana-ui/src/components/DateTimePickers/RelativeTimeRangePicker/RelativeTimeRangePicker.story.tsx b/packages/grafana-ui/src/components/DateTimePickers/RelativeTimeRangePicker/RelativeTimeRangePicker.story.tsx
index a6a0813e210..cacf19faf92 100644
--- a/packages/grafana-ui/src/components/DateTimePickers/RelativeTimeRangePicker/RelativeTimeRangePicker.story.tsx
+++ b/packages/grafana-ui/src/components/DateTimePickers/RelativeTimeRangePicker/RelativeTimeRangePicker.story.tsx
@@ -5,7 +5,7 @@ import { Meta, StoryFn } from '@storybook/react';
 import { RelativeTimeRangePicker } from './RelativeTimeRangePicker';
 
 const meta: Meta<typeof RelativeTimeRangePicker> = {
-  title: 'Pickers and Editors/TimePickers/RelativeTimeRangePicker',
+  title: 'Date time pickers/RelativeTimeRangePicker',
   component: RelativeTimeRangePicker,
   parameters: {
     controls: {
diff --git a/packages/grafana-ui/src/components/DateTimePickers/TimeOfDayPicker.story.tsx b/packages/grafana-ui/src/components/DateTimePickers/TimeOfDayPicker.story.tsx
index abd37242483..d3678e8dc84 100644
--- a/packages/grafana-ui/src/components/DateTimePickers/TimeOfDayPicker.story.tsx
+++ b/packages/grafana-ui/src/components/DateTimePickers/TimeOfDayPicker.story.tsx
@@ -7,7 +7,7 @@ import { dateTime } from '@grafana/data';
 import { TimeOfDayPicker } from './TimeOfDayPicker';
 
 const meta: Meta<typeof TimeOfDayPicker> = {
-  title: 'Pickers and Editors/TimePickers/TimeOfDayPicker',
+  title: 'Date time pickers/TimeOfDayPicker',
   component: TimeOfDayPicker,
   parameters: {
     controls: {
diff --git a/packages/grafana-ui/src/components/DateTimePickers/TimeRangeInput.story.tsx b/packages/grafana-ui/src/components/DateTimePickers/TimeRangeInput.story.tsx
index ef2ce7d2923..c70656bc070 100644
--- a/packages/grafana-ui/src/components/DateTimePickers/TimeRangeInput.story.tsx
+++ b/packages/grafana-ui/src/components/DateTimePickers/TimeRangeInput.story.tsx
@@ -30,7 +30,7 @@ const nullRange = {
 };
 
 const meta: Meta<typeof TimeRangeInput> = {
-  title: 'Pickers and Editors/TimePickers/TimeRangeInput',
+  title: 'Date time pickers/TimeRangeInput',
   component: TimeRangeInput,
   parameters: {
     controls: {
diff --git a/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker.story.tsx b/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker.story.tsx
index f7ae73b010c..dadb184d716 100644
--- a/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker.story.tsx
+++ b/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker.story.tsx
@@ -10,7 +10,7 @@ const to = dateTime();
 const from = to.subtract(6, 'h');
 
 const meta: Meta<typeof TimeRangePicker> = {
-  title: 'Pickers and Editors/TimePickers/TimeRangePicker',
+  title: 'Date time pickers/TimeRangePicker',
   component: TimeRangePicker,
   args: {
     value: {
diff --git a/packages/grafana-ui/src/components/DateTimePickers/TimeZonePicker.story.tsx b/packages/grafana-ui/src/components/DateTimePickers/TimeZonePicker.story.tsx
index ee1b5e7e9d5..da95bb70c81 100644
--- a/packages/grafana-ui/src/components/DateTimePickers/TimeZonePicker.story.tsx
+++ b/packages/grafana-ui/src/components/DateTimePickers/TimeZonePicker.story.tsx
@@ -5,7 +5,7 @@ import { Meta, StoryFn } from '@storybook/react';
 import { TimeZonePicker } from './TimeZonePicker';
 
 const meta: Meta<typeof TimeZonePicker> = {
-  title: 'Pickers and Editors/TimePickers/TimeZonePicker',
+  title: 'Date time pickers/TimeZonePicker',
   component: TimeZonePicker,
   parameters: {
     controls: {
diff --git a/packages/grafana-ui/src/components/DateTimePickers/WeekStartPicker.story.tsx b/packages/grafana-ui/src/components/DateTimePickers/WeekStartPicker.story.tsx
index cf80764789c..cc41f958d7b 100644
--- a/packages/grafana-ui/src/components/DateTimePickers/WeekStartPicker.story.tsx
+++ b/packages/grafana-ui/src/components/DateTimePickers/WeekStartPicker.story.tsx
@@ -5,7 +5,7 @@ import { Meta, StoryFn } from '@storybook/react';
 import { WeekStartPicker } from './WeekStartPicker';
 
 const meta: Meta<typeof WeekStartPicker> = {
-  title: 'Pickers and Editors/TimePickers/WeekStartPicker',
+  title: 'Date time pickers/WeekStartPicker',
   component: WeekStartPicker,
   parameters: {
     controls: {
diff --git a/packages/grafana-ui/src/components/Divider/Divider.story.tsx b/packages/grafana-ui/src/components/Divider/Divider.story.tsx
index f7757d80d4f..37317a0ee05 100644
--- a/packages/grafana-ui/src/components/Divider/Divider.story.tsx
+++ b/packages/grafana-ui/src/components/Divider/Divider.story.tsx
@@ -4,7 +4,7 @@ import { Divider } from './Divider';
 import mdx from './Divider.mdx';
 
 const meta: Meta<typeof Divider> = {
-  title: 'General/Divider',
+  title: 'Layout/Divider',
   component: Divider,
   parameters: {
     docs: {
diff --git a/packages/grafana-ui/src/components/Dropdown/ButtonSelect.internal.story.tsx b/packages/grafana-ui/src/components/Dropdown/ButtonSelect.story.tsx
similarity index 95%
rename from packages/grafana-ui/src/components/Dropdown/ButtonSelect.internal.story.tsx
rename to packages/grafana-ui/src/components/Dropdown/ButtonSelect.story.tsx
index edc03ecf4a4..a943ab93b73 100644
--- a/packages/grafana-ui/src/components/Dropdown/ButtonSelect.internal.story.tsx
+++ b/packages/grafana-ui/src/components/Dropdown/ButtonSelect.story.tsx
@@ -5,7 +5,7 @@ import { Meta, StoryFn } from '@storybook/react';
 import { ButtonSelect } from './ButtonSelect';
 
 const meta: Meta<typeof ButtonSelect> = {
-  title: 'Forms/Select/ButtonSelect',
+  title: 'Inputs/Deprecated/ButtonSelect',
   component: ButtonSelect,
   parameters: {
     controls: {
diff --git a/packages/grafana-ui/src/components/Dropdown/ButtonSelect.tsx b/packages/grafana-ui/src/components/Dropdown/ButtonSelect.tsx
index 7268565239e..3db07bcfcea 100644
--- a/packages/grafana-ui/src/components/Dropdown/ButtonSelect.tsx
+++ b/packages/grafana-ui/src/components/Dropdown/ButtonSelect.tsx
@@ -33,8 +33,7 @@ export interface Props<T> extends HTMLAttributes<HTMLButtonElement> {
 }
 
 /**
- * @internal
- * A temporary component until we have a proper dropdown component
+ * @deprecated Use Combobox or Dropdown instead
  */
 const ButtonSelectComponent = <T,>(props: Props<T>) => {
   const { className, options, value, onChange, narrow, variant, ...restProps } = props;
diff --git a/packages/grafana-ui/src/components/EmptySearchResult/EmptySearchResult.story.tsx b/packages/grafana-ui/src/components/EmptySearchResult/EmptySearchResult.story.tsx
index c44444597e0..c32e91e9777 100644
--- a/packages/grafana-ui/src/components/EmptySearchResult/EmptySearchResult.story.tsx
+++ b/packages/grafana-ui/src/components/EmptySearchResult/EmptySearchResult.story.tsx
@@ -4,7 +4,7 @@ import { EmptySearchResult } from './EmptySearchResult';
 import mdx from './EmptySearchResult.mdx';
 
 const meta: Meta<typeof EmptySearchResult> = {
-  title: 'Visualizations/EmptySearchResult',
+  title: 'Information/Deprecated/EmptySearchResult',
   component: EmptySearchResult,
   parameters: {
     docs: {
diff --git a/packages/grafana-ui/src/components/EmptySearchResult/EmptySearchResult.tsx b/packages/grafana-ui/src/components/EmptySearchResult/EmptySearchResult.tsx
index 23a794908bf..2ddafbf865b 100644
--- a/packages/grafana-ui/src/components/EmptySearchResult/EmptySearchResult.tsx
+++ b/packages/grafana-ui/src/components/EmptySearchResult/EmptySearchResult.tsx
@@ -8,6 +8,7 @@ export interface Props {
   children: JSX.Element | string;
 }
 
+/** @deprecated Use <EmptyState variant="not-found" /> instead */
 const EmptySearchResult = ({ children }: Props) => {
   const styles = useStyles2(getStyles);
   return <div className={styles.container}>{children}</div>;
diff --git a/packages/grafana-ui/src/components/EmptyState/EmptyState.story.tsx b/packages/grafana-ui/src/components/EmptyState/EmptyState.story.tsx
index c483f4ed4a4..d9d5b67f526 100644
--- a/packages/grafana-ui/src/components/EmptyState/EmptyState.story.tsx
+++ b/packages/grafana-ui/src/components/EmptyState/EmptyState.story.tsx
@@ -6,7 +6,7 @@ import { EmptyState } from './EmptyState';
 import mdx from './EmptyState.mdx';
 
 const meta: Meta<typeof EmptyState> = {
-  title: 'General/EmptyState',
+  title: 'Information/EmptyState',
   component: EmptyState,
   parameters: {
     docs: {
diff --git a/packages/grafana-ui/src/components/ErrorBoundary/ErrorBoundary.story.tsx b/packages/grafana-ui/src/components/ErrorBoundary/ErrorBoundary.story.tsx
index 474cfc400fb..b4dce6ba569 100644
--- a/packages/grafana-ui/src/components/ErrorBoundary/ErrorBoundary.story.tsx
+++ b/packages/grafana-ui/src/components/ErrorBoundary/ErrorBoundary.story.tsx
@@ -9,7 +9,7 @@ import mdx from './ErrorBoundary.mdx';
 import { ErrorWithStack } from './ErrorWithStack';
 
 const meta: Meta<typeof ErrorBoundary> = {
-  title: 'General/ErrorBoundary',
+  title: 'Utilities/ErrorBoundary',
   component: ErrorBoundary,
   parameters: {
     docs: {
diff --git a/packages/grafana-ui/src/components/FeatureBadge/FeatureBadge.story.tsx b/packages/grafana-ui/src/components/FeatureBadge/FeatureBadge.story.tsx
index e3e24bf77a9..e2a8d70dc0d 100644
--- a/packages/grafana-ui/src/components/FeatureBadge/FeatureBadge.story.tsx
+++ b/packages/grafana-ui/src/components/FeatureBadge/FeatureBadge.story.tsx
@@ -6,7 +6,7 @@ import { FeatureBadge } from './FeatureBadge';
 import mdx from './FeatureBadge.mdx';
 
 const meta: Meta<typeof FeatureBadge> = {
-  title: 'Data Display/FeatureBadge',
+  title: 'Information/FeatureBadge',
   component: FeatureBadge,
   parameters: {
     docs: { page: mdx },
diff --git a/packages/grafana-ui/src/components/FileDropzone/FileDropzone.story.tsx b/packages/grafana-ui/src/components/FileDropzone/FileDropzone.story.tsx
index de3ef47612e..ac9b70eb14c 100644
--- a/packages/grafana-ui/src/components/FileDropzone/FileDropzone.story.tsx
+++ b/packages/grafana-ui/src/components/FileDropzone/FileDropzone.story.tsx
@@ -4,7 +4,7 @@ import { FileDropzone } from './FileDropzone';
 import mdx from './FileDropzone.mdx';
 
 const meta: Meta<typeof FileDropzone> = {
-  title: 'Forms/FileDropzone',
+  title: 'Inputs/FileDropzone',
   component: FileDropzone,
   parameters: {
     docs: {
diff --git a/packages/grafana-ui/src/components/FileDropzone/FileListItem.story.tsx b/packages/grafana-ui/src/components/FileDropzone/FileListItem.story.tsx
index 3e10caf11f4..1b5d2eed5d2 100644
--- a/packages/grafana-ui/src/components/FileDropzone/FileListItem.story.tsx
+++ b/packages/grafana-ui/src/components/FileDropzone/FileListItem.story.tsx
@@ -4,7 +4,7 @@ import { FileListItem as FileListItemComponent, FileListItemProps } from './File
 import mdx from './FileListItem.mdx';
 
 const meta: Meta = {
-  title: 'Forms/FileListItem',
+  title: 'Inputs/FileListItem',
   component: FileListItemComponent,
   parameters: {
     docs: {
diff --git a/packages/grafana-ui/src/components/FileUpload/FileUpload.story.tsx b/packages/grafana-ui/src/components/FileUpload/FileUpload.story.tsx
index f6e7025553a..bdd445316ae 100644
--- a/packages/grafana-ui/src/components/FileUpload/FileUpload.story.tsx
+++ b/packages/grafana-ui/src/components/FileUpload/FileUpload.story.tsx
@@ -4,7 +4,7 @@ import { FileUpload } from './FileUpload';
 import mdx from './FileUpload.mdx';
 
 const meta: Meta<typeof FileUpload> = {
-  title: 'Forms/FileUpload',
+  title: 'Inputs/FileUpload',
   component: FileUpload,
   parameters: {
     docs: {
diff --git a/packages/grafana-ui/src/components/FilterPill/FilterPill.story.tsx b/packages/grafana-ui/src/components/FilterPill/FilterPill.story.tsx
index 54dec2ec7ea..eb4c48deae9 100644
--- a/packages/grafana-ui/src/components/FilterPill/FilterPill.story.tsx
+++ b/packages/grafana-ui/src/components/FilterPill/FilterPill.story.tsx
@@ -8,7 +8,7 @@ import { FilterPill } from './FilterPill';
 import mdx from './FilterPill.mdx';
 
 const meta: Meta<typeof FilterPill> = {
-  title: 'General/FilterPill',
+  title: 'Inputs/FilterPill',
   component: FilterPill,
   argTypes: {
     icon: { control: { type: 'select', options: getAvailableIcons() } },
diff --git a/packages/grafana-ui/src/components/FormField/FormField.internal.story.tsx b/packages/grafana-ui/src/components/FormField/FormField.story.tsx
similarity index 95%
rename from packages/grafana-ui/src/components/FormField/FormField.internal.story.tsx
rename to packages/grafana-ui/src/components/FormField/FormField.story.tsx
index efddb8d7f3c..845001dcacc 100644
--- a/packages/grafana-ui/src/components/FormField/FormField.internal.story.tsx
+++ b/packages/grafana-ui/src/components/FormField/FormField.story.tsx
@@ -3,7 +3,7 @@ import { Meta, StoryFn } from '@storybook/react';
 import { FormField } from './FormField';
 
 const meta: Meta<typeof FormField> = {
-  title: 'Forms/Legacy/FormField',
+  title: 'Forms/Deprecated/FormField',
   component: FormField,
   parameters: {
     controls: {
diff --git a/packages/grafana-ui/src/components/FormattedValueDisplay/FormattedValueDisplay.story.tsx b/packages/grafana-ui/src/components/FormattedValueDisplay/FormattedValueDisplay.story.tsx
index 3358a90f179..5f7cad8d3ec 100644
--- a/packages/grafana-ui/src/components/FormattedValueDisplay/FormattedValueDisplay.story.tsx
+++ b/packages/grafana-ui/src/components/FormattedValueDisplay/FormattedValueDisplay.story.tsx
@@ -4,7 +4,7 @@ import { FormattedValueDisplay } from './FormattedValueDisplay';
 import mdx from './FormattedValueDisplay.mdx';
 
 const meta: Meta<typeof FormattedValueDisplay> = {
-  title: 'Visualizations/FormattedValueDisplay',
+  title: 'Plugins/FormattedValueDisplay',
   component: FormattedValueDisplay,
   parameters: {
     docs: {
diff --git a/packages/grafana-ui/src/components/Forms/Checkbox.story.tsx b/packages/grafana-ui/src/components/Forms/Checkbox.story.tsx
index 8cdf3daa56d..fa4d1fb1d8e 100644
--- a/packages/grafana-ui/src/components/Forms/Checkbox.story.tsx
+++ b/packages/grafana-ui/src/components/Forms/Checkbox.story.tsx
@@ -9,7 +9,7 @@ import mdx from './Checkbox.mdx';
 import { Field } from './Field';
 
 const meta: Meta<typeof Checkbox> = {
-  title: 'Forms/Checkbox',
+  title: 'Inputs/Checkbox',
   component: Checkbox,
   parameters: {
     docs: {
diff --git a/packages/grafana-ui/src/components/Forms/Legacy/Input/Input.internal.story.tsx b/packages/grafana-ui/src/components/Forms/Legacy/Input/Input.internal.story.tsx
deleted file mode 100644
index a837949c744..00000000000
--- a/packages/grafana-ui/src/components/Forms/Legacy/Input/Input.internal.story.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-import { Meta, StoryFn } from '@storybook/react';
-import { zip, fromPairs } from 'lodash';
-import { useState } from 'react';
-
-import { EventsWithValidation } from '../../../../utils/validate';
-
-import { Input } from './Input';
-
-const meta: Meta = {
-  title: 'Forms/Legacy/Input',
-  component: Input,
-  parameters: {
-    controls: {
-      exclude: ['inputRef', 'onBlur', 'onFocus', 'onChange'],
-    },
-  },
-  argTypes: {
-    validationEvents: {
-      control: {
-        type: 'select',
-        options: fromPairs(zip(Object.keys(EventsWithValidation), Object.values(EventsWithValidation))),
-      },
-    },
-    validation: { name: 'Validation regex (will do a partial match if you do not anchor it)' },
-  },
-};
-
-const Wrapper: StoryFn = (args) => {
-  const [value, setValue] = useState('');
-  const validations = {
-    [args.validationEvents]: [
-      {
-        rule: (value: string) => {
-          return !!value.match(args.validation);
-        },
-        errorMessage: args.validationErrorMessage,
-      },
-    ],
-  };
-  return (
-    <Input
-      value={value}
-      onChange={(e) => setValue(e.currentTarget.value)}
-      validationEvents={validations}
-      hideErrorMessage={args.hideErrorMessage}
-    />
-  );
-};
-
-export const Basic = Wrapper.bind({});
-Basic.args = {
-  validation: '',
-  validationErrorMessage: 'Input not valid',
-  validationEvents: EventsWithValidation.onBlur,
-  hideErrorMessage: false,
-};
-
-export default meta;
diff --git a/packages/grafana-ui/src/components/Forms/Legacy/Select/Select.internal.story.tsx b/packages/grafana-ui/src/components/Forms/Legacy/Select/Select.internal.story.tsx
deleted file mode 100644
index 5e156ab8f9c..00000000000
--- a/packages/grafana-ui/src/components/Forms/Legacy/Select/Select.internal.story.tsx
+++ /dev/null
@@ -1,113 +0,0 @@
-import { action } from '@storybook/addon-actions';
-import { useArgs } from '@storybook/preview-api';
-import { Meta, StoryFn } from '@storybook/react';
-import { useCallback } from 'react';
-
-import { SelectableValue } from '@grafana/data';
-
-import { Select, AsyncSelect as AsyncSelectComponent } from './Select';
-
-const meta: Meta<typeof Select> = {
-  title: 'Forms/Legacy/Select',
-  component: Select,
-  parameters: {
-    controls: {
-      exclude: [
-        'className',
-        'menuPlacement',
-        'menuPosition',
-        'maxMenuHeight',
-        'minMenuHeight',
-        'maxVisibleValues',
-        'prefix',
-        'renderControl',
-        'value',
-        'tooltipContent',
-        'components',
-        'inputValue',
-        'id',
-        'inputId',
-        'defaultValue',
-        'aria-label',
-        'noOptionsMessage',
-        'onChange',
-        'onBlur',
-        'onKeyDown',
-        'filterOption',
-        'formatCreateLabel',
-        'getOptionLabel',
-        'getOptionValue',
-        'onCloseMenu',
-        'onCreateOption',
-        'onInputChange',
-        'onOpenMenu',
-        'isOptionDisabled',
-      ],
-    },
-  },
-  argTypes: {
-    width: { control: { type: 'range', min: 5, max: 30 } },
-  },
-};
-
-const initialValue: SelectableValue<string> = { label: 'A label', value: 'A value' };
-
-const options = [
-  initialValue,
-  { label: 'Another label', value: 'Another value 1' },
-  { label: 'Another label', value: 'Another value 2' },
-  { label: 'Another label', value: 'Another value 3' },
-  { label: 'Another label', value: 'Another value 4' },
-  { label: 'Another label', value: 'Another value 5' },
-  { label: 'Another label', value: 'Another value ' },
-];
-
-export const Basic: StoryFn<typeof Select> = (args) => {
-  const [, updateArgs] = useArgs();
-  return (
-    <Select
-      {...args}
-      onChange={(value) => {
-        action('onChange fired')(value);
-        updateArgs({ value });
-      }}
-    />
-  );
-};
-Basic.args = {
-  placeholder: 'Choose...',
-  options: options,
-  width: 20,
-};
-
-export const AsyncSelect: StoryFn<typeof AsyncSelectComponent> = (args) => {
-  const [, updateArgs] = useArgs();
-  const loadAsyncOptions = useCallback(
-    (inputValue: string) => {
-      return new Promise<Array<SelectableValue<string>>>((resolve) => {
-        setTimeout(() => {
-          updateArgs({ isLoading: false });
-          resolve(options.filter((option) => option.label && option.label.includes(inputValue)));
-        }, 1000);
-      });
-    },
-    [updateArgs]
-  );
-  return (
-    <AsyncSelectComponent
-      {...args}
-      loadOptions={loadAsyncOptions}
-      onChange={(value) => {
-        action('onChange')(value);
-        updateArgs({ value });
-      }}
-    />
-  );
-};
-AsyncSelect.args = {
-  isLoading: true,
-  defaultOptions: true,
-  width: 20,
-};
-
-export default meta;
diff --git a/packages/grafana-ui/src/components/Forms/Legacy/Switch/Switch.internal.story.tsx b/packages/grafana-ui/src/components/Forms/Legacy/Switch/Switch.internal.story.tsx
deleted file mode 100644
index a5578b4116a..00000000000
--- a/packages/grafana-ui/src/components/Forms/Legacy/Switch/Switch.internal.story.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import { Meta, StoryFn } from '@storybook/react';
-import { useState } from 'react';
-
-import { Switch } from './Switch';
-
-const meta: Meta<typeof Switch> = {
-  title: 'Forms/Legacy/Switch',
-  component: Switch,
-  parameters: {
-    controls: {
-      exclude: ['className', 'labelClass', 'switchClass', 'onChange'],
-    },
-  },
-};
-
-const SwitchWrapper: StoryFn<typeof Switch> = ({ label, ...args }) => {
-  const [checked, setChecked] = useState(false);
-  return <Switch {...args} label={label} checked={checked} onChange={() => setChecked(!checked)} />;
-};
-
-export const Basic = SwitchWrapper.bind({});
-Basic.args = {
-  label: 'Label',
-  tooltip: '',
-};
-
-export default meta;
diff --git a/packages/grafana-ui/src/components/Forms/RadioButtonGroup/RadioButtonGroup.story.tsx b/packages/grafana-ui/src/components/Forms/RadioButtonGroup/RadioButtonGroup.story.tsx
index f75f45c3c0b..4fe04474b16 100644
--- a/packages/grafana-ui/src/components/Forms/RadioButtonGroup/RadioButtonGroup.story.tsx
+++ b/packages/grafana-ui/src/components/Forms/RadioButtonGroup/RadioButtonGroup.story.tsx
@@ -5,7 +5,7 @@ import { RadioButtonGroup } from './RadioButtonGroup';
 import mdx from './RadioButtonGroup.mdx';
 
 const meta: Meta = {
-  title: 'Forms/RadioButtonGroup',
+  title: 'Inputs/RadioButtonGroup',
   component: RadioButtonGroup,
   parameters: {
     docs: {
diff --git a/packages/grafana-ui/src/components/Forms/RadioButtonList/RadioButtonList.story.tsx b/packages/grafana-ui/src/components/Forms/RadioButtonList/RadioButtonList.story.tsx
index 6f0fbd383f9..02a52297782 100644
--- a/packages/grafana-ui/src/components/Forms/RadioButtonList/RadioButtonList.story.tsx
+++ b/packages/grafana-ui/src/components/Forms/RadioButtonList/RadioButtonList.story.tsx
@@ -17,7 +17,7 @@ const defaultOptions: Array<SelectableValue<string>> = [
 ];
 
 const meta: Meta<typeof RadioButtonList> = {
-  title: 'Forms/RadioButtonList',
+  title: 'Inputs/RadioButtonList',
   component: RadioButtonList,
   parameters: {
     controls: {
diff --git a/packages/grafana-ui/src/components/Icon/Icon.story.tsx b/packages/grafana-ui/src/components/Icon/Icon.story.tsx
index cb2693589bc..0b567970206 100644
--- a/packages/grafana-ui/src/components/Icon/Icon.story.tsx
+++ b/packages/grafana-ui/src/components/Icon/Icon.story.tsx
@@ -13,7 +13,7 @@ import { Icon } from './Icon';
 import mdx from './Icon.mdx';
 
 const meta: Meta<typeof Icon> = {
-  title: 'Docs overview/Icon',
+  title: 'Iconography/Icon',
   component: Icon,
   parameters: {
     options: {
diff --git a/packages/grafana-ui/src/components/IconButton/IconButton.story.tsx b/packages/grafana-ui/src/components/IconButton/IconButton.story.tsx
index 7a1c7a0c6f3..ccd7c6ea26d 100644
--- a/packages/grafana-ui/src/components/IconButton/IconButton.story.tsx
+++ b/packages/grafana-ui/src/components/IconButton/IconButton.story.tsx
@@ -16,7 +16,7 @@ const defaultExcludes = ['ariaLabel', 'aria-label'];
 const additionalExcludes = ['size', 'name', 'variant', 'iconType'];
 
 const meta: Meta<typeof IconButton> = {
-  title: 'Buttons/IconButton',
+  title: 'Inputs/IconButton',
   component: IconButton,
   parameters: {
     docs: {
diff --git a/packages/grafana-ui/src/components/InfoBox/InfoBox.story.tsx b/packages/grafana-ui/src/components/InfoBox/InfoBox.story.tsx
index 354406e612c..176518c9cf0 100644
--- a/packages/grafana-ui/src/components/InfoBox/InfoBox.story.tsx
+++ b/packages/grafana-ui/src/components/InfoBox/InfoBox.story.tsx
@@ -9,7 +9,7 @@ import { InfoBox } from './InfoBox';
 import mdx from './InfoBox.mdx';
 
 const meta: Meta = {
-  title: 'Layout/InfoBox',
+  title: 'Information/Deprecated/InfoBox',
   component: InfoBox,
   decorators: [],
   parameters: {
diff --git a/packages/grafana-ui/src/components/InfoTooltip/InfoTooltip.internal.story.tsx b/packages/grafana-ui/src/components/InfoTooltip/InfoTooltip.story.tsx
similarity index 87%
rename from packages/grafana-ui/src/components/InfoTooltip/InfoTooltip.internal.story.tsx
rename to packages/grafana-ui/src/components/InfoTooltip/InfoTooltip.story.tsx
index 1ddd48f6cf4..610e9c2d3d9 100644
--- a/packages/grafana-ui/src/components/InfoTooltip/InfoTooltip.internal.story.tsx
+++ b/packages/grafana-ui/src/components/InfoTooltip/InfoTooltip.story.tsx
@@ -3,7 +3,7 @@ import { Meta, StoryFn } from '@storybook/react';
 import { InfoTooltip } from './InfoTooltip';
 
 const meta: Meta<typeof InfoTooltip> = {
-  title: 'Overlays/TooltipInternal',
+  title: 'Overlays/Deprecated/InfoTooltip',
   component: InfoTooltip,
 };
 
diff --git a/packages/grafana-ui/src/components/InfoTooltip/InfoTooltip.tsx b/packages/grafana-ui/src/components/InfoTooltip/InfoTooltip.tsx
index f7397864f73..6f189837c43 100644
--- a/packages/grafana-ui/src/components/InfoTooltip/InfoTooltip.tsx
+++ b/packages/grafana-ui/src/components/InfoTooltip/InfoTooltip.tsx
@@ -6,6 +6,7 @@ interface InfoTooltipProps extends Omit<TooltipProps, 'children' | 'content'> {
   children: PopoverContent;
 }
 
+/** @deprecated Use <IconButton name="info-circle" tooltip={children} /> instead */
 export const InfoTooltip = ({ children, ...restProps }: InfoTooltipProps) => {
   return <IconButton name="info-circle" tooltip={children} {...restProps} />;
 };
diff --git a/packages/grafana-ui/src/components/InlineToast/InlineToast.internal.story.tsx b/packages/grafana-ui/src/components/InlineToast/InlineToast.story.tsx
similarity index 93%
rename from packages/grafana-ui/src/components/InlineToast/InlineToast.internal.story.tsx
rename to packages/grafana-ui/src/components/InlineToast/InlineToast.story.tsx
index 7a34a3ec30f..3173eb4751d 100644
--- a/packages/grafana-ui/src/components/InlineToast/InlineToast.internal.story.tsx
+++ b/packages/grafana-ui/src/components/InlineToast/InlineToast.story.tsx
@@ -8,7 +8,7 @@ import { InlineToast as InlineToastImpl, InlineToastProps } from './InlineToast'
 import mdx from './InlineToast.mdx';
 
 const story: Meta = {
-  title: 'InlineToast',
+  title: 'Information/InlineToast',
   component: InlineToastImpl,
   parameters: {
     docs: {
@@ -16,7 +16,6 @@ const story: Meta = {
     },
   },
   argTypes: {
-    // foo is the property we want to remove from the UI
     referenceElement: {
       table: {
         disable: true,
diff --git a/packages/grafana-ui/src/components/Input/AutoSizeInput.story.tsx b/packages/grafana-ui/src/components/Input/AutoSizeInput.story.tsx
index d34a2c5c60d..60ef6d8a86f 100644
--- a/packages/grafana-ui/src/components/Input/AutoSizeInput.story.tsx
+++ b/packages/grafana-ui/src/components/Input/AutoSizeInput.story.tsx
@@ -18,7 +18,7 @@ const prefixSuffixOpts = {
 };
 
 const meta: Meta = {
-  title: 'Forms/Input/AutoSizeInput',
+  title: 'Inputs/AutoSizeInput',
   component: AutoSizeInput,
   parameters: {
     docs: {
diff --git a/packages/grafana-ui/src/components/Input/Input.story.tsx b/packages/grafana-ui/src/components/Input/Input.story.tsx
index 7cc245c9b9e..eab7f1d3ddc 100644
--- a/packages/grafana-ui/src/components/Input/Input.story.tsx
+++ b/packages/grafana-ui/src/components/Input/Input.story.tsx
@@ -22,7 +22,7 @@ const prefixSuffixOpts = {
 };
 
 const meta: Meta = {
-  title: 'Forms/Input',
+  title: 'Inputs/Input',
   component: Input,
   parameters: {
     docs: {
diff --git a/packages/grafana-ui/src/components/InteractiveTable/InteractiveTable.story.tsx b/packages/grafana-ui/src/components/InteractiveTable/InteractiveTable.story.tsx
index 454c4f77486..e0df9d9782f 100644
--- a/packages/grafana-ui/src/components/InteractiveTable/InteractiveTable.story.tsx
+++ b/packages/grafana-ui/src/components/InteractiveTable/InteractiveTable.story.tsx
@@ -103,7 +103,7 @@ const pageableData: CarData[] = [
 ];
 
 const meta: Meta<typeof InteractiveTable<CarData>> = {
-  title: 'Experimental/InteractiveTable',
+  title: 'Layout/InteractiveTable',
   component: InteractiveTable,
   parameters: {
     docs: {
diff --git a/packages/grafana-ui/src/components/Layout/Box/Box.story.tsx b/packages/grafana-ui/src/components/Layout/Box/Box.story.tsx
index 01e2c175fc3..0d07dd9d364 100644
--- a/packages/grafana-ui/src/components/Layout/Box/Box.story.tsx
+++ b/packages/grafana-ui/src/components/Layout/Box/Box.story.tsx
@@ -23,7 +23,7 @@ const borderRadiusOptions: BorderRadius[] = ['default', 'pill', 'circle'];
 const boxShadowOptions: BoxShadow[] = ['z1', 'z2', 'z3'];
 
 const meta: Meta<typeof Box> = {
-  title: 'General/Layout/Box',
+  title: 'Layout/Box',
   component: Box,
   parameters: {
     docs: {
diff --git a/packages/grafana-ui/src/components/Layout/Grid/Grid.story.tsx b/packages/grafana-ui/src/components/Layout/Grid/Grid.story.tsx
index 3e344991718..eee4984019c 100644
--- a/packages/grafana-ui/src/components/Layout/Grid/Grid.story.tsx
+++ b/packages/grafana-ui/src/components/Layout/Grid/Grid.story.tsx
@@ -11,7 +11,7 @@ const dimensions = Array.from({ length: 9 }).map(() => ({
 }));
 
 const meta: Meta<typeof Grid> = {
-  title: 'General/Layout/Grid',
+  title: 'Layout/Grid',
   component: Grid,
   parameters: {
     docs: {
diff --git a/packages/grafana-ui/src/components/Layout/Layout.story.tsx b/packages/grafana-ui/src/components/Layout/Layout.story.tsx
index 82f9e7bf15e..b8b1b273d97 100644
--- a/packages/grafana-ui/src/components/Layout/Layout.story.tsx
+++ b/packages/grafana-ui/src/components/Layout/Layout.story.tsx
@@ -7,13 +7,9 @@ import { HorizontalGroup, Layout, LayoutProps, VerticalGroup } from './Layout';
 import mdx from './Layout.mdx';
 
 const meta: Meta = {
-  title: 'Layout/Groups',
+  title: 'Layout/Deprecated/Groups',
   component: Layout,
   decorators: [withStoryContainer],
-  // SB7 has broken subcomponent types due to dropping support for the feature
-  // https://github.com/storybookjs/storybook/issues/20782
-  // @ts-ignore
-  subcomponents: { HorizontalGroup, VerticalGroup },
   parameters: {
     docs: {
       page: mdx,
diff --git a/packages/grafana-ui/src/components/Layout/Space.story.tsx b/packages/grafana-ui/src/components/Layout/Space.story.tsx
index 4b8ae94f908..8a58cadf6a8 100644
--- a/packages/grafana-ui/src/components/Layout/Space.story.tsx
+++ b/packages/grafana-ui/src/components/Layout/Space.story.tsx
@@ -7,7 +7,7 @@ import { Space } from './Space';
 import mdx from './Space.mdx';
 
 const meta: Meta<typeof Space> = {
-  title: 'General/Layout/Space',
+  title: 'Layout/Space',
   component: Space,
   parameters: {
     docs: {
diff --git a/packages/grafana-ui/src/components/Layout/Stack/Stack.story.tsx b/packages/grafana-ui/src/components/Layout/Stack/Stack.story.tsx
index 013b1a96ff9..5acad6ab10f 100644
--- a/packages/grafana-ui/src/components/Layout/Stack/Stack.story.tsx
+++ b/packages/grafana-ui/src/components/Layout/Stack/Stack.story.tsx
@@ -9,6 +9,16 @@ import { JustifyContent, Wrap, Direction } from '../types';
 import { Stack } from './Stack';
 import mdx from './Stack.mdx';
 
+const meta: Meta<typeof Stack> = {
+  title: 'Layout/Stack',
+  component: Stack,
+  parameters: {
+    docs: {
+      page: mdx,
+    },
+  },
+};
+
 const Item = ({ color, text, height }: { color: string; text?: string | number; height?: string }) => {
   return (
     <div
@@ -26,16 +36,6 @@ const Item = ({ color, text, height }: { color: string; text?: string | number;
   );
 };
 
-const meta: Meta<typeof Stack> = {
-  title: 'General/Layout/Stack',
-  component: Stack,
-  parameters: {
-    docs: {
-      page: mdx,
-    },
-  },
-};
-
 export const Basic: StoryFn<typeof Stack> = (args) => {
   const theme = useTheme2();
   return (
diff --git a/packages/grafana-ui/src/components/Link/TextLink.story.tsx b/packages/grafana-ui/src/components/Link/TextLink.story.tsx
index 6ecc925796c..6c1b9eb5fff 100644
--- a/packages/grafana-ui/src/components/Link/TextLink.story.tsx
+++ b/packages/grafana-ui/src/components/Link/TextLink.story.tsx
@@ -8,7 +8,7 @@ import { TextLink } from './TextLink';
 import mdx from './TextLink.mdx';
 
 const meta: Meta = {
-  title: 'General/TextLink',
+  title: 'Foundations/TextLink',
   component: TextLink,
   parameters: {
     docs: {
diff --git a/packages/grafana-ui/src/components/List/InlineList.tsx b/packages/grafana-ui/src/components/List/InlineList.tsx
index 454a897db47..8ea88dc18f7 100644
--- a/packages/grafana-ui/src/components/List/InlineList.tsx
+++ b/packages/grafana-ui/src/components/List/InlineList.tsx
@@ -2,6 +2,7 @@ import { PureComponent } from 'react';
 
 import { ListProps, AbstractList } from './AbstractList';
 
+/** @deprecated Use ul/li/arr.map directly instead */
 export class InlineList<T> extends PureComponent<ListProps<T>> {
   render() {
     return <AbstractList inline {...this.props} />;
diff --git a/packages/grafana-ui/src/components/List/List.internal.story.tsx b/packages/grafana-ui/src/components/List/List.story.tsx
similarity index 98%
rename from packages/grafana-ui/src/components/List/List.internal.story.tsx
rename to packages/grafana-ui/src/components/List/List.story.tsx
index b7b36a13735..998c92ab4a2 100644
--- a/packages/grafana-ui/src/components/List/List.internal.story.tsx
+++ b/packages/grafana-ui/src/components/List/List.story.tsx
@@ -6,7 +6,7 @@ import { InlineList } from './InlineList';
 import { List } from './List';
 
 const meta: Meta = {
-  title: 'Layout/List',
+  title: 'Layout/Deprecated/List',
   component: List,
   parameters: {
     controls: {
diff --git a/packages/grafana-ui/src/components/List/List.tsx b/packages/grafana-ui/src/components/List/List.tsx
index b257dfb4459..9f7788dedf9 100644
--- a/packages/grafana-ui/src/components/List/List.tsx
+++ b/packages/grafana-ui/src/components/List/List.tsx
@@ -2,6 +2,7 @@ import { PureComponent } from 'react';
 
 import { ListProps, AbstractList } from './AbstractList';
 
+/** @deprecated Use ul/li/arr.map directly instead */
 export class List<T> extends PureComponent<ListProps<T>> {
   render() {
     return <AbstractList {...this.props} />;
diff --git a/packages/grafana-ui/src/components/LoadingBar/LoadingBar.story.tsx b/packages/grafana-ui/src/components/LoadingBar/LoadingBar.story.tsx
index 90651d4002f..3b6e412cb59 100644
--- a/packages/grafana-ui/src/components/LoadingBar/LoadingBar.story.tsx
+++ b/packages/grafana-ui/src/components/LoadingBar/LoadingBar.story.tsx
@@ -10,7 +10,7 @@ import { LoadingBar, LoadingBarProps } from './LoadingBar';
 import mdx from './LoadingBar.mdx';
 
 const meta: Meta<typeof LoadingBar> = {
-  title: 'General/LoadingBar',
+  title: 'Information/LoadingBar',
   component: LoadingBar,
   parameters: {
     controls: {},
diff --git a/packages/grafana-ui/src/components/LoadingPlaceholder/LoadingPlaceholder.story.tsx b/packages/grafana-ui/src/components/LoadingPlaceholder/LoadingPlaceholder.story.tsx
index fa91db5d128..a35ee8cc576 100644
--- a/packages/grafana-ui/src/components/LoadingPlaceholder/LoadingPlaceholder.story.tsx
+++ b/packages/grafana-ui/src/components/LoadingPlaceholder/LoadingPlaceholder.story.tsx
@@ -4,7 +4,7 @@ import { LoadingPlaceholder, LoadingPlaceholderProps } from './LoadingPlaceholde
 import mdx from './LoadingPlaceholder.mdx';
 
 const meta: Meta<typeof LoadingPlaceholder> = {
-  title: 'General/LoadingPlaceholder',
+  title: 'Information/LoadingPlaceholder',
   component: LoadingPlaceholder,
   parameters: {
     docs: {
diff --git a/packages/grafana-ui/src/components/Menu/Menu.mdx b/packages/grafana-ui/src/components/Menu/Menu.mdx
index 681b6a55a54..20b023a0663 100644
--- a/packages/grafana-ui/src/components/Menu/Menu.mdx
+++ b/packages/grafana-ui/src/components/Menu/Menu.mdx
@@ -11,7 +11,7 @@ A simple menu component.
 
 ### When to use
 
-When you need to display a list of actions or navigation options in a dropdown.
+When you need to display a list of actions or navigation options, often used in combination with Dropdown.
 
 ### Usage
 
diff --git a/packages/grafana-ui/src/components/Menu/Menu.story.tsx b/packages/grafana-ui/src/components/Menu/Menu.story.tsx
index 741fe74a998..d0ea0726b3a 100644
--- a/packages/grafana-ui/src/components/Menu/Menu.story.tsx
+++ b/packages/grafana-ui/src/components/Menu/Menu.story.tsx
@@ -8,7 +8,7 @@ import { Menu } from './Menu';
 import mdx from './Menu.mdx';
 
 const meta: Meta<typeof Menu> = {
-  title: 'General/Menu',
+  title: 'Overlays/Menu',
   component: Menu,
   argTypes: {},
   parameters: {
diff --git a/packages/grafana-ui/src/components/Monaco/CodeEditor.internal.story.tsx b/packages/grafana-ui/src/components/Monaco/CodeEditor.story.tsx
similarity index 97%
rename from packages/grafana-ui/src/components/Monaco/CodeEditor.internal.story.tsx
rename to packages/grafana-ui/src/components/Monaco/CodeEditor.story.tsx
index 39a713cf26a..9717fc5d4d8 100644
--- a/packages/grafana-ui/src/components/Monaco/CodeEditor.internal.story.tsx
+++ b/packages/grafana-ui/src/components/Monaco/CodeEditor.story.tsx
@@ -5,7 +5,7 @@ import { CodeEditor } from './CodeEditor';
 import mdx from './CodeEditor.mdx';
 
 const meta: Meta<typeof CodeEditor> = {
-  title: 'CodeEditor',
+  title: 'Inputs/CodeEditor',
   component: CodeEditor,
   parameters: {
     docs: {
diff --git a/packages/grafana-ui/src/components/PageLayout/PageToolbar.story.tsx b/packages/grafana-ui/src/components/PageLayout/PageToolbar.story.tsx
index 1c0e984cf4f..4a308a6d0be 100644
--- a/packages/grafana-ui/src/components/PageLayout/PageToolbar.story.tsx
+++ b/packages/grafana-ui/src/components/PageLayout/PageToolbar.story.tsx
@@ -9,7 +9,7 @@ import { ToolbarButton } from '../ToolbarButton/ToolbarButton';
 import { PageToolbar } from './PageToolbar';
 
 const meta: Meta<typeof PageToolbar> = {
-  title: 'Layout/PageToolbar',
+  title: 'Navigation/Deprecated/PageToolbar',
   component: PageToolbar,
   parameters: {},
 };
diff --git a/packages/grafana-ui/src/components/PageLayout/PageToolbar.tsx b/packages/grafana-ui/src/components/PageLayout/PageToolbar.tsx
index c010ded3766..296d79212f6 100644
--- a/packages/grafana-ui/src/components/PageLayout/PageToolbar.tsx
+++ b/packages/grafana-ui/src/components/PageLayout/PageToolbar.tsx
@@ -34,7 +34,7 @@ export interface Props {
   forceShowLeftItems?: boolean;
 }
 
-/** @alpha */
+/** @deprecated Use Page instead */
 export const PageToolbar = memo(
   ({
     title,
diff --git a/packages/grafana-ui/src/components/Pagination/Pagination.story.tsx b/packages/grafana-ui/src/components/Pagination/Pagination.story.tsx
index 88705331252..9fc662b3bdf 100644
--- a/packages/grafana-ui/src/components/Pagination/Pagination.story.tsx
+++ b/packages/grafana-ui/src/components/Pagination/Pagination.story.tsx
@@ -5,7 +5,7 @@ import { Pagination } from './Pagination';
 import mdx from './Pagination.mdx';
 
 const meta: Meta<typeof Pagination> = {
-  title: 'Buttons/Pagination',
+  title: 'Navigation/Pagination',
   component: Pagination,
   parameters: {
     docs: {
diff --git a/packages/grafana-ui/src/components/PanelChrome/PanelChrome.story.tsx b/packages/grafana-ui/src/components/PanelChrome/PanelChrome.story.tsx
index de64d94c7f5..e401f94a162 100644
--- a/packages/grafana-ui/src/components/PanelChrome/PanelChrome.story.tsx
+++ b/packages/grafana-ui/src/components/PanelChrome/PanelChrome.story.tsx
@@ -22,7 +22,7 @@ const PANEL_WIDTH = 400;
 const PANEL_HEIGHT = 150;
 
 const meta: Meta<typeof PanelChrome> = {
-  title: 'Visualizations/PanelChrome',
+  title: 'Plugins/PanelChrome',
   component: PanelChrome,
   parameters: {
     controls: {
diff --git a/packages/grafana-ui/src/components/PanelContainer/PanelContainer.story.tsx b/packages/grafana-ui/src/components/PanelContainer/PanelContainer.story.tsx
index cafb8150597..3bb9eb4f24e 100644
--- a/packages/grafana-ui/src/components/PanelContainer/PanelContainer.story.tsx
+++ b/packages/grafana-ui/src/components/PanelContainer/PanelContainer.story.tsx
@@ -4,7 +4,7 @@ import { PanelContainer } from './PanelContainer';
 import mdx from './PanelContainer.mdx';
 
 const meta: Meta<typeof PanelContainer> = {
-  title: 'General/PanelContainer',
+  title: 'Layout/Deprecated/PanelContainer',
   component: PanelContainer,
   parameters: {
     docs: {
diff --git a/packages/grafana-ui/src/components/PanelContainer/PanelContainer.tsx b/packages/grafana-ui/src/components/PanelContainer/PanelContainer.tsx
index 7d60c5cb3a0..5279c363675 100644
--- a/packages/grafana-ui/src/components/PanelContainer/PanelContainer.tsx
+++ b/packages/grafana-ui/src/components/PanelContainer/PanelContainer.tsx
@@ -7,6 +7,8 @@ import { useStyles2 } from '../../themes/ThemeContext';
 
 type Props = DetailedHTMLProps<HTMLAttributes<HTMLDivElement>, HTMLDivElement>;
 
+// TODO: Reimplement this with Box
+/** @deprecated Use Box instead */
 export const PanelContainer = ({ children, className, ...props }: Props) => {
   const styles = useStyles2(getStyles);
   return (
diff --git a/packages/grafana-ui/src/components/PluginSignatureBadge/PluginSignatureBadge.story.tsx b/packages/grafana-ui/src/components/PluginSignatureBadge/PluginSignatureBadge.story.tsx
index a16932f7eea..4dfbbebdd9f 100644
--- a/packages/grafana-ui/src/components/PluginSignatureBadge/PluginSignatureBadge.story.tsx
+++ b/packages/grafana-ui/src/components/PluginSignatureBadge/PluginSignatureBadge.story.tsx
@@ -6,7 +6,7 @@ import { PluginSignatureBadge } from './PluginSignatureBadge';
 import mdx from './PluginSignatureBadge.mdx';
 
 const meta: Meta<typeof PluginSignatureBadge> = {
-  title: 'Data Display/PluginSignatureBadge',
+  title: 'Information/PluginSignatureBadge',
   component: PluginSignatureBadge,
   argTypes: {
     status: {
diff --git a/packages/grafana-ui/src/components/QueryField/QueryField.story.tsx b/packages/grafana-ui/src/components/QueryField/QueryField.story.tsx
index ce7e4b61f80..4b11c87e4ac 100644
--- a/packages/grafana-ui/src/components/QueryField/QueryField.story.tsx
+++ b/packages/grafana-ui/src/components/QueryField/QueryField.story.tsx
@@ -5,7 +5,7 @@ import { TypeaheadInput } from '../../types/completion';
 import { QueryField, QueryFieldProps } from './QueryField';
 
 const meta: Meta<typeof QueryField> = {
-  title: 'Data Source/QueryField',
+  title: 'Inputs/Deprecated/QueryField',
   component: QueryField,
   parameters: {
     controls: {
diff --git a/packages/grafana-ui/src/components/RefreshPicker/RefreshPicker.story.tsx b/packages/grafana-ui/src/components/RefreshPicker/RefreshPicker.story.tsx
index 4124cae6242..38c04065e02 100644
--- a/packages/grafana-ui/src/components/RefreshPicker/RefreshPicker.story.tsx
+++ b/packages/grafana-ui/src/components/RefreshPicker/RefreshPicker.story.tsx
@@ -6,7 +6,7 @@ import { RefreshPicker } from './RefreshPicker';
 import mdx from './RefreshPicker.mdx';
 
 const meta: Meta<typeof RefreshPicker> = {
-  title: 'Pickers and Editors/RefreshPicker',
+  title: 'Pickers/RefreshPicker',
   component: RefreshPicker,
   parameters: {
     docs: {
diff --git a/packages/grafana-ui/src/components/RenderUserContentAsHTML/RenderUserContentAsHTML.story.tsx b/packages/grafana-ui/src/components/RenderUserContentAsHTML/RenderUserContentAsHTML.story.tsx
index 3cc29fa45e6..9b00e28e49d 100644
--- a/packages/grafana-ui/src/components/RenderUserContentAsHTML/RenderUserContentAsHTML.story.tsx
+++ b/packages/grafana-ui/src/components/RenderUserContentAsHTML/RenderUserContentAsHTML.story.tsx
@@ -4,7 +4,7 @@ import { RenderUserContentAsHTML } from './RenderUserContentAsHTML';
 import mdx from './RenderUserContentAsHTML.mdx';
 
 const meta: Meta<typeof RenderUserContentAsHTML> = {
-  title: 'General/RenderUserContentAsHTML',
+  title: 'Utilities/RenderUserContentAsHTML',
   component: RenderUserContentAsHTML,
   parameters: {
     docs: {
diff --git a/packages/grafana-ui/src/components/ScrollContainer/ScrollContainer.story.tsx b/packages/grafana-ui/src/components/ScrollContainer/ScrollContainer.story.tsx
index a633b347cf0..2d3cf51788a 100644
--- a/packages/grafana-ui/src/components/ScrollContainer/ScrollContainer.story.tsx
+++ b/packages/grafana-ui/src/components/ScrollContainer/ScrollContainer.story.tsx
@@ -5,7 +5,7 @@ import { ScrollContainer } from './ScrollContainer';
 import mdx from './ScrollContainer.mdx';
 
 const meta: Meta<typeof ScrollContainer> = {
-  title: 'General/Layout/ScrollContainer',
+  title: 'Layout/ScrollContainer',
   component: ScrollContainer,
   parameters: {
     controls: {
diff --git a/packages/grafana-ui/src/components/SecretFormField/SecretFormField.internal.story.tsx b/packages/grafana-ui/src/components/SecretFormField/SecretFormField.story.tsx
similarity index 96%
rename from packages/grafana-ui/src/components/SecretFormField/SecretFormField.internal.story.tsx
rename to packages/grafana-ui/src/components/SecretFormField/SecretFormField.story.tsx
index 8c5b7943625..5d756a0fa33 100644
--- a/packages/grafana-ui/src/components/SecretFormField/SecretFormField.internal.story.tsx
+++ b/packages/grafana-ui/src/components/SecretFormField/SecretFormField.story.tsx
@@ -5,7 +5,7 @@ import { Meta, StoryFn } from '@storybook/react';
 import { SecretFormField } from './SecretFormField';
 
 const meta: Meta<typeof SecretFormField> = {
-  title: 'Forms/SecretFormField',
+  title: 'Forms/Deprecated/SecretFormField',
   component: SecretFormField,
   parameters: {
     controls: {
diff --git a/packages/grafana-ui/src/components/SecretInput/SecretInput.story.tsx b/packages/grafana-ui/src/components/SecretInput/SecretInput.story.tsx
index bc02d0f7204..db315e329fd 100644
--- a/packages/grafana-ui/src/components/SecretInput/SecretInput.story.tsx
+++ b/packages/grafana-ui/src/components/SecretInput/SecretInput.story.tsx
@@ -5,7 +5,7 @@ import { SecretInput } from './SecretInput';
 import mdx from './SecretInput.mdx';
 
 const meta: Meta<typeof SecretInput> = {
-  title: 'Forms/SecretInput',
+  title: 'Inputs/SecretInput',
   component: SecretInput,
   parameters: {
     docs: {
diff --git a/packages/grafana-ui/src/components/SecretTextArea/SecretTextArea.story.tsx b/packages/grafana-ui/src/components/SecretTextArea/SecretTextArea.story.tsx
index 4e71c1fd66a..9ee9fef61fe 100644
--- a/packages/grafana-ui/src/components/SecretTextArea/SecretTextArea.story.tsx
+++ b/packages/grafana-ui/src/components/SecretTextArea/SecretTextArea.story.tsx
@@ -4,7 +4,7 @@ import { useState, ChangeEvent } from 'react';
 import { SecretTextArea } from './SecretTextArea';
 
 const meta: Meta<typeof SecretTextArea> = {
-  title: 'Forms/SecretTextArea',
+  title: 'Inputs/SecretTextArea',
   component: SecretTextArea,
   parameters: {
     controls: {
diff --git a/packages/grafana-ui/src/components/Segment/Segment.story.tsx b/packages/grafana-ui/src/components/Segment/Segment.story.tsx
index 735c0833f53..91ae6c47bfb 100644
--- a/packages/grafana-ui/src/components/Segment/Segment.story.tsx
+++ b/packages/grafana-ui/src/components/Segment/Segment.story.tsx
@@ -60,7 +60,7 @@ export const ArrayOptions = () => {
 };
 
 const meta: Meta<typeof Segment> = {
-  title: 'Data Source/Segment/SegmentSync',
+  title: 'Inputs/Segment',
   component: Segment,
 };
 
diff --git a/packages/grafana-ui/src/components/Segment/SegmentAsync.story.tsx b/packages/grafana-ui/src/components/Segment/SegmentAsync.story.tsx
index 26460bf62c6..9b64c2fca74 100644
--- a/packages/grafana-ui/src/components/Segment/SegmentAsync.story.tsx
+++ b/packages/grafana-ui/src/components/Segment/SegmentAsync.story.tsx
@@ -61,7 +61,7 @@ export const ArrayOptions = () => {
 };
 
 const meta: Meta<typeof SegmentAsync> = {
-  title: 'Data Source/Segment/SegmentAsync',
+  title: 'Inputs/SegmentAsync',
   component: SegmentAsync,
 };
 
diff --git a/packages/grafana-ui/src/components/Segment/SegmentInput.story.tsx b/packages/grafana-ui/src/components/Segment/SegmentInput.story.tsx
index e73d694f235..780f6b4aba2 100644
--- a/packages/grafana-ui/src/components/Segment/SegmentInput.story.tsx
+++ b/packages/grafana-ui/src/components/Segment/SegmentInput.story.tsx
@@ -30,7 +30,7 @@ export const BasicInput = () => {
 };
 
 const meta: Meta<typeof SegmentInput> = {
-  title: 'Data Source/Segment/SegmentInput',
+  title: 'Inputs/SegmentInput',
   component: SegmentInput,
 };
 
diff --git a/packages/grafana-ui/src/components/Select/Select.story.tsx b/packages/grafana-ui/src/components/Select/Select.story.tsx
index e73c07b7311..7e8388442a1 100644
--- a/packages/grafana-ui/src/components/Select/Select.story.tsx
+++ b/packages/grafana-ui/src/components/Select/Select.story.tsx
@@ -37,12 +37,8 @@ const manyGroupedOptions = [
 ];
 
 const meta: Meta = {
-  title: 'Forms/Select',
+  title: 'Inputs/Deprecated/Select',
   component: Select,
-  // SB7 has broken subcomponent types due to dropping support for the feature
-  // https://github.com/storybookjs/storybook/issues/20782
-  // @ts-ignore
-  subcomponents: { AsyncSelect, MultiSelect, AsyncMultiSelect },
   parameters: {
     docs: {
       page: mdx,
diff --git a/packages/grafana-ui/src/components/Select/SelectPerf.internal.story.tsx b/packages/grafana-ui/src/components/Select/SelectPerf.story.tsx
similarity index 98%
rename from packages/grafana-ui/src/components/Select/SelectPerf.internal.story.tsx
rename to packages/grafana-ui/src/components/Select/SelectPerf.story.tsx
index d147b90a2b5..357eee70561 100644
--- a/packages/grafana-ui/src/components/Select/SelectPerf.internal.story.tsx
+++ b/packages/grafana-ui/src/components/Select/SelectPerf.story.tsx
@@ -9,7 +9,7 @@ import { Label } from '../Forms/Label';
 import { Select, VirtualizedSelect } from './Select';
 
 const meta: Meta = {
-  title: 'Forms/Select (Perf)',
+  title: 'Developers/Select Perf',
   argTypes: {
     numberOfOptions: {
       defaultValue: 10_000,
diff --git a/packages/grafana-ui/src/components/Slider/RangeSlider.story.tsx b/packages/grafana-ui/src/components/Slider/RangeSlider.story.tsx
index 458ee63941a..eccb916483a 100644
--- a/packages/grafana-ui/src/components/Slider/RangeSlider.story.tsx
+++ b/packages/grafana-ui/src/components/Slider/RangeSlider.story.tsx
@@ -3,7 +3,7 @@ import { Meta, StoryFn } from '@storybook/react';
 import { RangeSlider } from './RangeSlider';
 
 const meta: Meta<typeof RangeSlider> = {
-  title: 'Forms/Slider/Range',
+  title: 'Inputs/RangeSlider',
   component: RangeSlider,
   parameters: {
     controls: {
diff --git a/packages/grafana-ui/src/components/Slider/Slider.story.tsx b/packages/grafana-ui/src/components/Slider/Slider.story.tsx
index 5b110318423..a4180712444 100644
--- a/packages/grafana-ui/src/components/Slider/Slider.story.tsx
+++ b/packages/grafana-ui/src/components/Slider/Slider.story.tsx
@@ -3,7 +3,7 @@ import { StoryFn, Meta } from '@storybook/react';
 import { Slider } from './Slider';
 
 const meta: Meta<typeof Slider> = {
-  title: 'Forms/Slider',
+  title: 'Inputs/Slider',
   component: Slider,
   parameters: {
     controls: {
diff --git a/packages/grafana-ui/src/components/Spinner/Spinner.story.tsx b/packages/grafana-ui/src/components/Spinner/Spinner.story.tsx
index 4b6cc484c33..509f6c73525 100644
--- a/packages/grafana-ui/src/components/Spinner/Spinner.story.tsx
+++ b/packages/grafana-ui/src/components/Spinner/Spinner.story.tsx
@@ -4,7 +4,7 @@ import { Props, Spinner } from './Spinner';
 import mdx from './Spinner.mdx';
 
 const meta: Meta = {
-  title: 'Visualizations/Spinner',
+  title: 'Information/Spinner',
   component: Spinner,
   parameters: {
     docs: {
diff --git a/packages/grafana-ui/src/components/Splitter/useSplitter.story.tsx b/packages/grafana-ui/src/components/Splitter/useSplitter.story.tsx
index d469c2fc12e..3c7b7bf2a29 100644
--- a/packages/grafana-ui/src/components/Splitter/useSplitter.story.tsx
+++ b/packages/grafana-ui/src/components/Splitter/useSplitter.story.tsx
@@ -7,7 +7,7 @@ import { UseSplitterOptions, useSplitter } from './useSplitter';
 import mdx from './useSplitter.mdx';
 
 const meta: Meta = {
-  title: 'General/Layout/useSplitter',
+  title: 'Utilities/useSplitter',
   parameters: {
     docs: { page: mdx },
     controls: {
diff --git a/packages/grafana-ui/src/components/StatsPicker/StatsPicker.story.tsx b/packages/grafana-ui/src/components/StatsPicker/StatsPicker.story.tsx
index f586fa350c2..7e20cb9288f 100644
--- a/packages/grafana-ui/src/components/StatsPicker/StatsPicker.story.tsx
+++ b/packages/grafana-ui/src/components/StatsPicker/StatsPicker.story.tsx
@@ -37,7 +37,7 @@ class WrapperWithState extends PureComponent<Props, State> {
 }
 
 const meta: Meta<typeof StatsPicker> = {
-  title: 'Pickers and Editors/StatsPicker',
+  title: 'Pickers/StatsPicker',
   component: StatsPicker,
   parameters: {
     controls: {
diff --git a/packages/grafana-ui/src/components/Switch/Switch.story.tsx b/packages/grafana-ui/src/components/Switch/Switch.story.tsx
index 23d5ed1f796..ae4786d0fe5 100644
--- a/packages/grafana-ui/src/components/Switch/Switch.story.tsx
+++ b/packages/grafana-ui/src/components/Switch/Switch.story.tsx
@@ -10,7 +10,7 @@ import { InlineSwitch, Switch } from './Switch';
 import mdx from './Switch.mdx';
 
 const meta: Meta<typeof Switch> = {
-  title: 'Forms/Switch',
+  title: 'Inputs/Switch',
   component: Switch,
   parameters: {
     docs: {
diff --git a/packages/grafana-ui/src/components/Table/Table.story.tsx b/packages/grafana-ui/src/components/Table/Table.story.tsx
index ff9fe3160f8..35944868d22 100644
--- a/packages/grafana-ui/src/components/Table/Table.story.tsx
+++ b/packages/grafana-ui/src/components/Table/Table.story.tsx
@@ -23,7 +23,7 @@ import mdx from './Table.mdx';
 import { FooterItem, TableCellDisplayMode, TableCustomCellOptions } from './types';
 
 const meta: Meta<typeof Table> = {
-  title: 'Visualizations/Table',
+  title: 'Plugins/Table',
   component: Table,
   parameters: {
     controls: {
diff --git a/packages/grafana-ui/src/components/TableInputCSV/TableInputCSV.internal.story.tsx b/packages/grafana-ui/src/components/TableInputCSV/TableInputCSV.story.tsx
similarity index 92%
rename from packages/grafana-ui/src/components/TableInputCSV/TableInputCSV.internal.story.tsx
rename to packages/grafana-ui/src/components/TableInputCSV/TableInputCSV.story.tsx
index ccac99b8644..124dfc46af9 100644
--- a/packages/grafana-ui/src/components/TableInputCSV/TableInputCSV.internal.story.tsx
+++ b/packages/grafana-ui/src/components/TableInputCSV/TableInputCSV.story.tsx
@@ -6,7 +6,7 @@ import { DataFrame } from '@grafana/data';
 import { TableInputCSV } from './TableInputCSV';
 
 const meta: Meta<typeof TableInputCSV> = {
-  title: 'Forms/TableInputCSV',
+  title: 'Inputs/Deprecated/TableInputCSV',
   component: TableInputCSV,
 };
 
diff --git a/packages/grafana-ui/src/components/TableInputCSV/TableInputCSV.tsx b/packages/grafana-ui/src/components/TableInputCSV/TableInputCSV.tsx
index f4a3e11e755..2a705aac90d 100644
--- a/packages/grafana-ui/src/components/TableInputCSV/TableInputCSV.tsx
+++ b/packages/grafana-ui/src/components/TableInputCSV/TableInputCSV.tsx
@@ -101,6 +101,7 @@ export class UnThemedTableInputCSV extends PureComponent<Props, State> {
   }
 }
 
+/** @deprecated */
 export const TableInputCSV = withTheme2(UnThemedTableInputCSV);
 TableInputCSV.displayName = 'TableInputCSV';
 
diff --git a/packages/grafana-ui/src/components/Tabs/Tabs.story.tsx b/packages/grafana-ui/src/components/Tabs/Tabs.story.tsx
index b6189591bd1..8f630d37346 100644
--- a/packages/grafana-ui/src/components/Tabs/Tabs.story.tsx
+++ b/packages/grafana-ui/src/components/Tabs/Tabs.story.tsx
@@ -10,7 +10,7 @@ import { TabsBar } from './TabsBar';
 import mdx from './TabsBar.mdx';
 
 const meta: Meta = {
-  title: 'Layout/Tabs',
+  title: 'Navigation/Tabs',
   parameters: {
     docs: {
       page: mdx,
diff --git a/packages/grafana-ui/src/components/Tags/Tag.story.tsx b/packages/grafana-ui/src/components/Tags/Tag.story.tsx
index 3610fa381fe..b9aa5a61632 100644
--- a/packages/grafana-ui/src/components/Tags/Tag.story.tsx
+++ b/packages/grafana-ui/src/components/Tags/Tag.story.tsx
@@ -5,7 +5,7 @@ import { Tag } from './Tag';
 import mdx from './Tag.mdx';
 
 const meta: Meta<typeof Tag> = {
-  title: 'Forms/Tags/Tag',
+  title: 'Information/Tag',
   component: Tag,
   parameters: {
     docs: {
diff --git a/packages/grafana-ui/src/components/Tags/TagList.story.tsx b/packages/grafana-ui/src/components/Tags/TagList.story.tsx
index 56acb2e3f39..7d8c6094de3 100644
--- a/packages/grafana-ui/src/components/Tags/TagList.story.tsx
+++ b/packages/grafana-ui/src/components/Tags/TagList.story.tsx
@@ -5,7 +5,7 @@ import { TagList } from './TagList';
 import mdx from './TagList.mdx';
 
 const meta: Meta<typeof TagList> = {
-  title: 'Forms/Tags/TagList',
+  title: 'Information/TagList',
   component: TagList,
   parameters: {
     docs: {
diff --git a/packages/grafana-ui/src/components/TagsInput/TagsInput.story.tsx b/packages/grafana-ui/src/components/TagsInput/TagsInput.story.tsx
index 295357be5e3..b02f40c649a 100644
--- a/packages/grafana-ui/src/components/TagsInput/TagsInput.story.tsx
+++ b/packages/grafana-ui/src/components/TagsInput/TagsInput.story.tsx
@@ -7,7 +7,7 @@ import { TagsInput } from './TagsInput';
 import mdx from './TagsInput.mdx';
 
 const meta: Meta<typeof TagsInput> = {
-  title: 'Forms/TagsInput',
+  title: 'Inputs/TagsInput',
   component: TagsInput,
   parameters: {
     docs: {
diff --git a/packages/grafana-ui/src/components/Text/Text.story.tsx b/packages/grafana-ui/src/components/Text/Text.story.tsx
index 07071f64b02..f23056df839 100644
--- a/packages/grafana-ui/src/components/Text/Text.story.tsx
+++ b/packages/grafana-ui/src/components/Text/Text.story.tsx
@@ -7,7 +7,7 @@ import { Text } from './Text';
 import mdx from './Text.mdx';
 
 const meta: Meta = {
-  title: 'General/Text',
+  title: 'Foundations/Text',
   component: Text,
   parameters: {
     docs: {
diff --git a/packages/grafana-ui/src/components/TextArea/TextArea.story.tsx b/packages/grafana-ui/src/components/TextArea/TextArea.story.tsx
index d977c73361a..337984c93dd 100644
--- a/packages/grafana-ui/src/components/TextArea/TextArea.story.tsx
+++ b/packages/grafana-ui/src/components/TextArea/TextArea.story.tsx
@@ -4,7 +4,7 @@ import { TextArea } from './TextArea';
 import mdx from './TextArea.mdx';
 
 const meta: Meta = {
-  title: 'Forms/TextArea',
+  title: 'Inputs/TextArea',
   component: TextArea,
   parameters: {
     controls: {
diff --git a/packages/grafana-ui/src/components/ThemeDemos/BorderRadius.internal.story.tsx b/packages/grafana-ui/src/components/ThemeDemos/BorderRadius.story.tsx
similarity index 95%
rename from packages/grafana-ui/src/components/ThemeDemos/BorderRadius.internal.story.tsx
rename to packages/grafana-ui/src/components/ThemeDemos/BorderRadius.story.tsx
index c938199176c..92b35ccf142 100644
--- a/packages/grafana-ui/src/components/ThemeDemos/BorderRadius.internal.story.tsx
+++ b/packages/grafana-ui/src/components/ThemeDemos/BorderRadius.story.tsx
@@ -3,7 +3,7 @@ import { Meta, StoryFn } from '@storybook/react';
 import { BorderRadiusContainer } from './BorderRadius';
 
 const meta: Meta = {
-  title: 'Docs Overview/Theme',
+  title: 'Developers/Border radius',
   component: BorderRadiusContainer,
   decorators: [],
   parameters: {
diff --git a/packages/grafana-ui/src/components/ThemeDemos/EmotionPerfTest.story.tsx b/packages/grafana-ui/src/components/ThemeDemos/EmotionPerfTest.story.tsx
new file mode 100644
index 00000000000..29cf50f7d6c
--- /dev/null
+++ b/packages/grafana-ui/src/components/ThemeDemos/EmotionPerfTest.story.tsx
@@ -0,0 +1,20 @@
+import { Meta, StoryFn } from '@storybook/react';
+
+import { EmotionPerfTest } from './EmotionPerfTest';
+
+const meta: Meta = {
+  title: 'Developers/Emotion perf test',
+  decorators: [],
+  parameters: {
+    options: {
+      showPanel: false,
+    },
+    docs: {},
+  },
+};
+
+export const PerfTest: StoryFn = () => {
+  return <EmotionPerfTest />;
+};
+
+export default meta;
diff --git a/packages/grafana-ui/src/components/ThemeDemos/ThemeDemo.story.tsx b/packages/grafana-ui/src/components/ThemeDemos/ThemeDemo.story.tsx
index edb28e35fcf..32fa7f40835 100644
--- a/packages/grafana-ui/src/components/ThemeDemos/ThemeDemo.story.tsx
+++ b/packages/grafana-ui/src/components/ThemeDemos/ThemeDemo.story.tsx
@@ -1,10 +1,9 @@
 import { Meta, StoryFn } from '@storybook/react';
 
-import { EmotionPerfTest } from './EmotionPerfTest';
 import { ThemeDemo as NewThemeDemoComponent } from './ThemeDemo';
 
 const meta: Meta = {
-  title: 'Docs Overview/Theme',
+  title: 'Foundations/Theme',
   component: NewThemeDemoComponent,
   decorators: [],
   parameters: {
@@ -19,8 +18,4 @@ export const ThemeDemo: StoryFn = () => {
   return <NewThemeDemoComponent />;
 };
 
-export const PerfTest: StoryFn = () => {
-  return <EmotionPerfTest />;
-};
-
 export default meta;
diff --git a/packages/grafana-ui/src/components/Text/Typography.internal.story.tsx b/packages/grafana-ui/src/components/ThemeDemos/Typography.story.tsx
similarity index 97%
rename from packages/grafana-ui/src/components/Text/Typography.internal.story.tsx
rename to packages/grafana-ui/src/components/ThemeDemos/Typography.story.tsx
index d9c347a4bf7..0bc75786461 100644
--- a/packages/grafana-ui/src/components/Text/Typography.internal.story.tsx
+++ b/packages/grafana-ui/src/components/ThemeDemos/Typography.story.tsx
@@ -5,11 +5,10 @@ import * as React from 'react';
 import { Divider } from '../Divider/Divider';
 import { Field } from '../Forms/Field';
 import { Stack } from '../Layout/Stack/Stack';
-
-import { Text } from './Text';
+import { Text } from '../Text/Text';
 
 const meta: Meta = {
-  title: 'General/Text',
+  title: 'Developers/Typography',
 };
 
 const FONT_WEIGHTS = [/*100, 200, 300, */ 400, 500 /*600, 700, 800, 900*/];
diff --git a/packages/grafana-ui/src/components/ToolbarButton/ToolbarButton.story.tsx b/packages/grafana-ui/src/components/ToolbarButton/ToolbarButton.story.tsx
index 18234f1b0d0..04c66996a26 100644
--- a/packages/grafana-ui/src/components/ToolbarButton/ToolbarButton.story.tsx
+++ b/packages/grafana-ui/src/components/ToolbarButton/ToolbarButton.story.tsx
@@ -9,7 +9,7 @@ import mdx from './ToolbarButton.mdx';
 import { ToolbarButtonRow } from './ToolbarButtonRow';
 
 const meta: Meta<typeof ToolbarButton> = {
-  title: 'Buttons/ToolbarButton',
+  title: 'Navigation/ToolbarButton',
   component: ToolbarButton,
   parameters: {
     docs: {
diff --git a/packages/grafana-ui/src/components/ToolbarButton/ToolbarButtonRow.story.tsx b/packages/grafana-ui/src/components/ToolbarButton/ToolbarButtonRow.story.tsx
index 45bd93b0d60..144424b9c00 100644
--- a/packages/grafana-ui/src/components/ToolbarButton/ToolbarButtonRow.story.tsx
+++ b/packages/grafana-ui/src/components/ToolbarButton/ToolbarButtonRow.story.tsx
@@ -7,7 +7,7 @@ import { ToolbarButtonRow } from './ToolbarButtonRow';
 import mdx from './ToolbarButtonRow.mdx';
 
 const meta: Meta<typeof ToolbarButtonRow> = {
-  title: 'Buttons/ToolbarButton/ToolbarButtonRow',
+  title: 'Navigation/ToolbarButtonRow',
   component: ToolbarButtonRow,
   parameters: {
     docs: {
diff --git a/packages/grafana-ui/src/components/UnitPicker/UnitPicker.story.tsx b/packages/grafana-ui/src/components/UnitPicker/UnitPicker.story.tsx
index bfd795724f4..beb4a467507 100644
--- a/packages/grafana-ui/src/components/UnitPicker/UnitPicker.story.tsx
+++ b/packages/grafana-ui/src/components/UnitPicker/UnitPicker.story.tsx
@@ -4,7 +4,7 @@ import { Meta, StoryFn } from '@storybook/react';
 import { UnitPicker, UnitPickerProps } from './UnitPicker';
 
 const meta: Meta<typeof UnitPicker> = {
-  title: 'Pickers and Editors/UnitPicker',
+  title: 'Pickers/UnitPicker',
   component: UnitPicker,
   parameters: {
     controls: {
diff --git a/packages/grafana-ui/src/components/UsersIndicator/Avatar.story.tsx b/packages/grafana-ui/src/components/UsersIndicator/Avatar.story.tsx
index 7352e846434..f20b4b809b5 100644
--- a/packages/grafana-ui/src/components/UsersIndicator/Avatar.story.tsx
+++ b/packages/grafana-ui/src/components/UsersIndicator/Avatar.story.tsx
@@ -4,7 +4,7 @@ import { Avatar } from './Avatar';
 import mdx from './Avatar.mdx';
 
 const meta: Meta<typeof Avatar> = {
-  title: 'General/UsersIndicator/Avatar',
+  title: 'Iconography/Avatar',
   component: Avatar,
   parameters: {
     docs: { page: mdx },
diff --git a/packages/grafana-ui/src/components/UsersIndicator/UserIcon.story.tsx b/packages/grafana-ui/src/components/UsersIndicator/UserIcon.story.tsx
index c8e2ebd55f5..b17dad6fb32 100644
--- a/packages/grafana-ui/src/components/UsersIndicator/UserIcon.story.tsx
+++ b/packages/grafana-ui/src/components/UsersIndicator/UserIcon.story.tsx
@@ -4,7 +4,7 @@ import { UserIcon } from './UserIcon';
 import mdx from './UserIcon.mdx';
 
 const meta: Meta<typeof UserIcon> = {
-  title: 'General/UsersIndicator/UserIcon',
+  title: 'Iconography/UserIcon',
   component: UserIcon,
   argTypes: {},
   parameters: {
diff --git a/packages/grafana-ui/src/components/UsersIndicator/UsersIndicator.story.tsx b/packages/grafana-ui/src/components/UsersIndicator/UsersIndicator.story.tsx
index 00a16d4c304..a7b0a6b9b97 100644
--- a/packages/grafana-ui/src/components/UsersIndicator/UsersIndicator.story.tsx
+++ b/packages/grafana-ui/src/components/UsersIndicator/UsersIndicator.story.tsx
@@ -4,7 +4,7 @@ import { UsersIndicator } from './UsersIndicator';
 import mdx from './UsersIndicator.mdx';
 
 const meta: Meta<typeof UsersIndicator> = {
-  title: 'General/UsersIndicator',
+  title: 'Iconography/UsersIndicator',
   component: UsersIndicator,
   argTypes: { limit: { control: { type: 'number', min: 1 } } },
   parameters: {
diff --git a/packages/grafana-ui/src/components/ValuePicker/ValuePicker.story.tsx b/packages/grafana-ui/src/components/ValuePicker/ValuePicker.story.tsx
index 86d4df02e8d..ab83e8bcd6e 100644
--- a/packages/grafana-ui/src/components/ValuePicker/ValuePicker.story.tsx
+++ b/packages/grafana-ui/src/components/ValuePicker/ValuePicker.story.tsx
@@ -7,7 +7,7 @@ import { ValuePicker } from './ValuePicker';
 import mdx from './ValuePicker.mdx';
 
 const meta: Meta<typeof ValuePicker> = {
-  title: 'Pickers and Editors/ValuePicker',
+  title: 'Pickers/ValuePicker',
   component: ValuePicker,
   parameters: {
     docs: {
diff --git a/packages/grafana-ui/src/components/VizLayout/VizLayout.story.tsx b/packages/grafana-ui/src/components/VizLayout/VizLayout.story.tsx
index 7e8e93a5a9c..939329c821f 100644
--- a/packages/grafana-ui/src/components/VizLayout/VizLayout.story.tsx
+++ b/packages/grafana-ui/src/components/VizLayout/VizLayout.story.tsx
@@ -4,7 +4,7 @@ import { useEffect, useState } from 'react';
 import { VizLayout } from './VizLayout';
 
 const meta: Meta = {
-  title: 'Visualizations/VizLayout',
+  title: 'Plugins/VizLayout',
   component: VizLayout,
   parameters: {
     docs: {},
diff --git a/packages/grafana-ui/src/components/VizLegend/VizLegend.story.tsx b/packages/grafana-ui/src/components/VizLegend/VizLegend.story.tsx
index f6a38b71937..b9af4d23fc4 100644
--- a/packages/grafana-ui/src/components/VizLegend/VizLegend.story.tsx
+++ b/packages/grafana-ui/src/components/VizLegend/VizLegend.story.tsx
@@ -10,7 +10,7 @@ import { VizLegend } from './VizLegend';
 import { VizLegendItem } from './types';
 
 const meta: Meta = {
-  title: 'Visualizations/VizLegend',
+  title: 'Plugins/VizLegend',
   component: VizLegend,
   args: {
     containerWidth: '100%',
diff --git a/packages/grafana-ui/src/components/VizTooltip/SeriesTable.story.tsx b/packages/grafana-ui/src/components/VizTooltip/SeriesTable.story.tsx
index 9b5b1d30699..17b9408051a 100644
--- a/packages/grafana-ui/src/components/VizTooltip/SeriesTable.story.tsx
+++ b/packages/grafana-ui/src/components/VizTooltip/SeriesTable.story.tsx
@@ -3,7 +3,7 @@ import { StoryFn, Meta } from '@storybook/react';
 import { SeriesTable } from './SeriesTable';
 
 const meta: Meta<typeof SeriesTable> = {
-  title: 'Visualizations/VizTooltip/SeriesTable',
+  title: 'Plugins/SeriesTable',
   component: SeriesTable,
   argTypes: {
     timestamp: {
diff --git a/packages/grafana-ui/src/graveyard/Graph/GraphWithLegend.internal.story.tsx b/packages/grafana-ui/src/graveyard/Graph/GraphWithLegend.internal.story.tsx
deleted file mode 100644
index cb613aa228f..00000000000
--- a/packages/grafana-ui/src/graveyard/Graph/GraphWithLegend.internal.story.tsx
+++ /dev/null
@@ -1,140 +0,0 @@
-import { StoryFn } from '@storybook/react';
-
-import { GraphSeriesXY, FieldType, dateTime, FieldColorModeId } from '@grafana/data';
-import { LegendDisplayMode } from '@grafana/schema';
-
-import { GraphWithLegend, GraphWithLegendProps } from './GraphWithLegend';
-
-export default {
-  title: 'Visualizations/Graph/GraphWithLegend',
-  component: GraphWithLegend,
-  parameters: {
-    controls: {
-      exclude: ['className', 'ariaLabel', 'legendDisplayMode', 'series'],
-    },
-  },
-  argTypes: {
-    displayMode: { control: { type: 'radio' }, options: ['table', 'list', 'hidden'] },
-    placement: { control: { type: 'radio' }, options: ['bottom', 'right'] },
-    rightAxisSeries: { name: 'Right y-axis series, i.e. A,C' },
-    timeZone: { control: { type: 'radio' }, options: ['browser', 'utc'] },
-    width: { control: { type: 'range', min: 200, max: 800 } },
-    height: { control: { type: 'range', min: 1700, step: 300 } },
-    lineWidth: { control: { type: 'range', min: 1, max: 10 } },
-  },
-};
-
-const series: GraphSeriesXY[] = [
-  {
-    data: [
-      [1546372800000, 10],
-      [1546376400000, 20],
-      [1546380000000, 10],
-    ],
-    color: 'red',
-    isVisible: true,
-    label: 'A-series',
-    seriesIndex: 0,
-    timeField: {
-      type: FieldType.time,
-      name: 'time',
-      values: [1546372800000, 1546376400000, 1546380000000],
-      config: {},
-    },
-    valueField: {
-      type: FieldType.number,
-      name: 'a-series',
-      values: [10, 20, 10],
-      config: {
-        color: {
-          mode: FieldColorModeId.Fixed,
-          fixedColor: 'red',
-        },
-      },
-    },
-    timeStep: 3600000,
-    yAxis: {
-      index: 1,
-    },
-  },
-  {
-    data: [
-      [1546372800000, 20],
-      [1546376400000, 30],
-      [1546380000000, 40],
-    ],
-    color: 'blue',
-    isVisible: true,
-    label: 'B-series',
-    seriesIndex: 1,
-    timeField: {
-      type: FieldType.time,
-      name: 'time',
-      values: [1546372800000, 1546376400000, 1546380000000],
-      config: {},
-    },
-    valueField: {
-      type: FieldType.number,
-      name: 'b-series',
-      values: [20, 30, 40],
-      config: {
-        color: {
-          mode: FieldColorModeId.Fixed,
-          fixedColor: 'blue',
-        },
-      },
-    },
-    timeStep: 3600000,
-    yAxis: {
-      index: 1,
-    },
-  },
-];
-
-interface StoryProps extends GraphWithLegendProps {
-  rightAxisSeries: string;
-  displayMode: string;
-}
-
-export const WithLegend: StoryFn<StoryProps> = ({ rightAxisSeries, displayMode, legendDisplayMode, ...args }) => {
-  const props: Partial<GraphWithLegendProps> = {
-    series: series.map((s) => {
-      if (
-        rightAxisSeries
-          .split(',')
-          .map((s) => s.trim())
-          .indexOf(s.label.split('-')[0]) > -1
-      ) {
-        s.yAxis = { index: 2 };
-      } else {
-        s.yAxis = { index: 1 };
-      }
-      return s;
-    }),
-  };
-
-  return (
-    <GraphWithLegend
-      legendDisplayMode={displayMode === 'table' ? LegendDisplayMode.Table : LegendDisplayMode.List}
-      {...args}
-      {...props}
-    />
-  );
-};
-WithLegend.args = {
-  rightAxisSeries: '',
-  displayMode: 'list',
-  onToggleSort: () => {},
-  timeRange: {
-    from: dateTime(1546372800000),
-    to: dateTime(1546380000000),
-    raw: {
-      from: dateTime(1546372800000),
-      to: dateTime(1546380000000),
-    },
-  },
-  timeZone: 'browser',
-  width: 600,
-  height: 300,
-  placement: 'bottom',
-};
diff --git a/packages/grafana-ui/src/utils/useDelayedSwitch.internal.story.tsx b/packages/grafana-ui/src/utils/useDelayedSwitch.story.tsx
similarity index 90%
rename from packages/grafana-ui/src/utils/useDelayedSwitch.internal.story.tsx
rename to packages/grafana-ui/src/utils/useDelayedSwitch.story.tsx
index c00cdc86e11..23e3b22d1c6 100644
--- a/packages/grafana-ui/src/utils/useDelayedSwitch.internal.story.tsx
+++ b/packages/grafana-ui/src/utils/useDelayedSwitch.story.tsx
@@ -3,7 +3,7 @@ import { StoryFn } from '@storybook/react';
 import { useDelayedSwitch } from './useDelayedSwitch';
 
 export default {
-  title: 'useDelayedSwitch',
+  title: 'Utilities/useDelayedSwitch',
 };
 
 export const Basic: StoryFn = ({ value, delay, duration }) => {

From feedb5c0a6a79425b64d4fb7f86851085bfe08b9 Mon Sep 17 00:00:00 2001
From: Dominik Prokop <dominik.prokop@grafana.com>
Date: Tue, 8 Jul 2025 14:40:13 +0200
Subject: [PATCH 14/21] PublicDashboardsBadge: Fix react warning (#107768)

---
 .../scene/new-toolbar/actions/PublicDashboardBadge.tsx   | 9 ++-------
 .../features/dashboard/components/DashNav/DashNav.tsx    | 4 +++-
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/public/app/features/dashboard-scene/scene/new-toolbar/actions/PublicDashboardBadge.tsx b/public/app/features/dashboard-scene/scene/new-toolbar/actions/PublicDashboardBadge.tsx
index 9cab7a7ab2a..36ee44d14de 100644
--- a/public/app/features/dashboard-scene/scene/new-toolbar/actions/PublicDashboardBadge.tsx
+++ b/public/app/features/dashboard-scene/scene/new-toolbar/actions/PublicDashboardBadge.tsx
@@ -18,19 +18,14 @@ export const PublicDashboardBadge = ({ dashboard }: ToolbarActionProps) => {
 // Used in old architecture
 export const PublicDashboardBadgeLegacy = PublicDashboardBadgeInternal;
 
-function PublicDashboardBadgeInternal({ uid }: { uid?: string }) {
-  if (!uid) {
-    return null;
-  }
-
+function PublicDashboardBadgeInternal({ uid }: { uid: string }) {
   const { data: publicDashboard } = useGetPublicDashboardQuery(uid);
+  const styles = useStyles2(getStyles);
 
   if (!publicDashboard) {
     return null;
   }
 
-  const styles = useStyles2(getStyles);
-
   return (
     <Badge
       color="blue"
diff --git a/public/app/features/dashboard/components/DashNav/DashNav.tsx b/public/app/features/dashboard/components/DashNav/DashNav.tsx
index 0999d86780e..aeb072faf93 100644
--- a/public/app/features/dashboard/components/DashNav/DashNav.tsx
+++ b/public/app/features/dashboard/components/DashNav/DashNav.tsx
@@ -212,7 +212,9 @@ export const DashNav = memo<Props>((props) => {
       );
     }
 
-    buttons.push(<PublicDashboardBadgeLegacy key="public-dashboard-badge" uid={dashboard.uid} />);
+    if (dashboard.uid) {
+      buttons.push(<PublicDashboardBadgeLegacy key="public-dashboard-badge" uid={dashboard.uid} />);
+    }
 
     if (isDevEnv && config.featureToggles.dashboardScene) {
       buttons.push(

From d5a1781fb6149eb443dc3f11de23d6dcc2f6f50e Mon Sep 17 00:00:00 2001
From: Dominik Prokop <dominik.prokop@grafana.com>
Date: Tue, 8 Jul 2025 14:42:30 +0200
Subject: [PATCH 15/21] Schema V2: Simplify annotations v1<->v2 conversions
 (#107390)

* Initial migration pending to test

* Update tests

* apply feedback

* Remove unnecessary types

* Fix types

* Update tests

* fixing tests

* Default DS for transformer

* Update the default DS

* Update the generated sdk files

* Restore commented tests

* Update tests

* Updating snapshots

* fix

* Do not preserve empty datasource in panel spec

* update provisioning v2 sample dashboard

* Fix test

* Prettier

* Fix import e2e

* Prettier

* restore commented tests

* Update to support annotations

* Lint

* Make gen apps

* Make the build pass

Signed-off-by: Igor Suleymanov <igor.suleymanov@grafana.com>

* Update grafana-app-sdk to 0.39.2

* Workspace update

* make gen-cue

* Runtime error fix

* Update dashboard spec

* Update go workspaces

* Schema V2: Simplify annotations v1<->v2 conversions

* Update public/app/features/dashboard-scene/serialization/transformSceneToSaveModelSchemaV2.ts

* Cleanup and some more tests

* test improvement

* Update public/app/features/dashboard-scene/serialization/transformSceneToSaveModelSchemaV2.ts

* Update go.sum

* make generate

* Update public/app/features/dashboard-scene/serialization/transformSceneToSaveModelSchemaV2.ts

Co-authored-by: Haris Rozajac <58232930+harisrozajac@users.noreply.github.com>

* ts

* make gen-apps

* Update response transformers to correctly handle v2->v1 annotations

* Update dashboards openapi snapshot

---------

Signed-off-by: Igor Suleymanov <igor.suleymanov@grafana.com>
Co-authored-by: Ivan Ortega <ivanortegaalba@gmail.com>
Co-authored-by: alexandra vargas <alexa1866@gmail.com>
Co-authored-by: Haris Rozajac <haris.rozajac12@gmail.com>
Co-authored-by: Igor Suleymanov <igor.suleymanov@grafana.com>
Co-authored-by: spinillos <selenepinillos@gmail.com>
Co-authored-by: Haris Rozajac <58232930+harisrozajac@users.noreply.github.com>
---
 .../kinds/v2alpha1/dashboard_spec.cue         |   2 +-
 .../dashboard/v2alpha1/dashboard_spec.cue     |   2 +-
 .../dashboard/v2alpha1/dashboard_spec_gen.go  |   2 +-
 .../v2alpha1/zz_generated.openapi.go          |   2 +-
 .../sample/dashboard-v1-annotations.json      | 257 ++++++++++++++++++
 .../dashboard/v2alpha1/types.spec.gen.ts      |   2 +-
 .../dashboard.grafana.app-v2alpha1.json       |   2 +-
 .../DashboardSceneSerializer.test.ts          | 224 +++++++++++++++
 .../serialization/annotations.test.ts         | 226 +++++++++++++++
 .../serialization/annotations.ts              | 118 ++++++++
 .../transformSaveModelSchemaV2ToScene.test.ts |  12 +-
 .../transformSaveModelSchemaV2ToScene.ts      |  38 +--
 .../transformSceneToSaveModelSchemaV2.test.ts |  24 +-
 .../transformSceneToSaveModelSchemaV2.ts      | 125 ++-------
 .../api/ResponseTransformers.test.ts          |   9 +-
 .../dashboard/api/ResponseTransformers.ts     |  23 +-
 16 files changed, 876 insertions(+), 192 deletions(-)
 create mode 100644 conf/provisioning/sample/dashboard-v1-annotations.json
 create mode 100644 public/app/features/dashboard-scene/serialization/annotations.test.ts
 create mode 100644 public/app/features/dashboard-scene/serialization/annotations.ts

diff --git a/apps/dashboard/kinds/v2alpha1/dashboard_spec.cue b/apps/dashboard/kinds/v2alpha1/dashboard_spec.cue
index 180cc985669..95da187b1e5 100644
--- a/apps/dashboard/kinds/v2alpha1/dashboard_spec.cue
+++ b/apps/dashboard/kinds/v2alpha1/dashboard_spec.cue
@@ -394,7 +394,7 @@ AnnotationQuerySpec: {
 	name:        string
 	builtIn?:    bool | *false
 	filter?:     AnnotationPanelFilter
-	legacyOptions?:     [string]: _ //Catch-all field for datasource-specific properties
+	legacyOptions?:     [string]: _ // Catch-all field for datasource-specific properties. Should not be available in as code tooling.
 }
 
 AnnotationQueryKind: {
diff --git a/apps/dashboard/pkg/apis/dashboard/v2alpha1/dashboard_spec.cue b/apps/dashboard/pkg/apis/dashboard/v2alpha1/dashboard_spec.cue
index 50306a06aa0..8cc188b0909 100644
--- a/apps/dashboard/pkg/apis/dashboard/v2alpha1/dashboard_spec.cue
+++ b/apps/dashboard/pkg/apis/dashboard/v2alpha1/dashboard_spec.cue
@@ -398,7 +398,7 @@ AnnotationQuerySpec: {
 	name:        string
 	builtIn?:    bool | *false
 	filter?:     AnnotationPanelFilter
-	legacyOptions?:     [string]: _ //Catch-all field for datasource-specific properties
+	legacyOptions?:     [string]: _ // Catch-all field for datasource-specific properties. Should not be available in as code tooling.
 }
 
 AnnotationQueryKind: {
diff --git a/apps/dashboard/pkg/apis/dashboard/v2alpha1/dashboard_spec_gen.go b/apps/dashboard/pkg/apis/dashboard/v2alpha1/dashboard_spec_gen.go
index 79d77c4de74..f1acc3f273b 100644
--- a/apps/dashboard/pkg/apis/dashboard/v2alpha1/dashboard_spec_gen.go
+++ b/apps/dashboard/pkg/apis/dashboard/v2alpha1/dashboard_spec_gen.go
@@ -30,7 +30,7 @@ type DashboardAnnotationQuerySpec struct {
 	Name      string                          `json:"name"`
 	BuiltIn   *bool                           `json:"builtIn,omitempty"`
 	Filter    *DashboardAnnotationPanelFilter `json:"filter,omitempty"`
-	// Catch-all field for datasource-specific properties
+	// Catch-all field for datasource-specific properties. Should not be available in as code tooling.
 	LegacyOptions map[string]interface{} `json:"legacyOptions,omitempty"`
 }
 
diff --git a/apps/dashboard/pkg/apis/dashboard/v2alpha1/zz_generated.openapi.go b/apps/dashboard/pkg/apis/dashboard/v2alpha1/zz_generated.openapi.go
index 4e55caae3c6..302f539a9ec 100644
--- a/apps/dashboard/pkg/apis/dashboard/v2alpha1/zz_generated.openapi.go
+++ b/apps/dashboard/pkg/apis/dashboard/v2alpha1/zz_generated.openapi.go
@@ -643,7 +643,7 @@ func schema_pkg_apis_dashboard_v2alpha1_DashboardAnnotationQuerySpec(ref common.
 					},
 					"legacyOptions": {
 						SchemaProps: spec.SchemaProps{
-							Description: "Catch-all field for datasource-specific properties",
+							Description: "Catch-all field for datasource-specific properties. Should not be available in as code tooling.",
 							Type:        []string{"object"},
 							AdditionalProperties: &spec.SchemaOrBool{
 								Allows: true,
diff --git a/conf/provisioning/sample/dashboard-v1-annotations.json b/conf/provisioning/sample/dashboard-v1-annotations.json
new file mode 100644
index 00000000000..7e90452a2a5
--- /dev/null
+++ b/conf/provisioning/sample/dashboard-v1-annotations.json
@@ -0,0 +1,257 @@
+{
+  "kind": "Dashboard",
+  "apiVersion": "dashboard.grafana.app/v1beta1",
+  "metadata": {
+    "name": "test-v1-annotations",
+    "annotations": {
+      "hello": "world"
+    },
+    "labels": {
+      "region": "west"
+    }
+  },
+  "spec": {
+    "annotations": {
+      "list": [
+        {
+          "builtIn": 1,
+          "datasource": {
+            "type": "grafana",
+            "uid": "-- Grafana --"
+          },
+          "enable": true,
+          "hide": false,
+          "iconColor": "rgba(0, 211, 255, 1)",
+          "name": "Annotations & Alerts",
+          "target": {
+            "limit": 100,
+            "matchAny": false,
+            "tags": [],
+            "type": "dashboard"
+          },
+          "type": "dashboard"
+        },
+        {
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
+          "enable": true,
+          "hide": false,
+          "iconColor": "blue",
+          "name": "testdata-annos",
+          "target": {
+            "lines": 10,
+            "refId": "Anno",
+            "scenarioId": "annotations"
+          }
+        },
+        {
+          "enable": true,
+          "hide": false,
+          "iconColor": "blue",
+          "name": "no-ds-testdata-annos",
+          "target": {
+            "lines": 10,
+            "refId": "Anno",
+            "scenarioId": "annotations"
+          }
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "gdev-prometheus"
+          },
+          "enable": true,
+          "hide": false,
+          "iconColor": "yellow",
+          "name": "prom-annos",
+          "target": {
+            "expr": "{action=\"add_client\"}",
+            "interval": "",
+            "lines": 10,
+            "refId": "Anno",
+            "scenarioId": "annotations"
+          }
+        },
+        {
+          "enable": true,
+          "hide": false,
+          "iconColor": "yellow",
+          "name": "no-ds-prom-annos",
+          "target": {
+            "expr": "{action=\"add_client\"}",
+            "interval": "",
+            "lines": 10,
+            "refId": "Anno",
+            "scenarioId": "annotations"
+          }
+        },
+        {
+          "datasource": {
+            "type": "grafana-postgresql-datasource",
+            "uid": "PBBCEC2D313BC06C3"
+          },
+          "enable": true,
+          "hide": false,
+          "iconColor": "red",
+          "name": "postgress-annos",
+          "target": {
+            "editorMode": "builder",
+            "format": "table",
+            "lines": 10,
+            "rawSql": "",
+            "refId": "Anno",
+            "scenarioId": "annotations",
+            "sql": {
+              "columns": [
+                {
+                  "parameters": [],
+                  "type": "function"
+                }
+              ],
+              "groupBy": [
+                {
+                  "property": {
+                    "type": "string"
+                  },
+                  "type": "groupBy"
+                }
+              ],
+              "limit": 50
+            }
+          }
+        },
+        {
+          "datasource": {
+            "type": "elasticsearch",
+            "uid": "gdev-elasticsearch"
+          },
+          "enable": true,
+          "hide": false,
+          "iconColor": "red",
+          "name": "elastic - annos",
+          "tagsField": "asd",
+          "target": {
+            "lines": 10,
+            "query": "test query",
+            "refId": "Anno",
+            "scenarioId": "annotations"
+          },
+          "textField": "asd",
+          "timeEndField": "asdas",
+          "timeField": "asd"
+        }
+      ]
+    },
+    "editable": true,
+    "fiscalYearStartMonth": 0,
+    "graphTooltip": 0,
+    "links": [],
+    "panels": [
+      {
+        "datasource": {
+          "type": "grafana-testdata-datasource",
+          "uid": "PD8C576611E62080A"
+        },
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "palette-classic"
+            },
+            "custom": {
+              "axisBorderShow": false,
+              "axisCenteredZero": false,
+              "axisColorMode": "text",
+              "axisLabel": "",
+              "axisPlacement": "auto",
+              "barAlignment": 0,
+              "barWidthFactor": 0.6,
+              "drawStyle": "line",
+              "fillOpacity": 0,
+              "gradientMode": "none",
+              "hideFrom": {
+                "legend": false,
+                "tooltip": false,
+                "viz": false
+              },
+              "insertNulls": false,
+              "lineInterpolation": "linear",
+              "lineWidth": 1,
+              "pointSize": 5,
+              "scaleDistribution": {
+                "type": "linear"
+              },
+              "showPoints": "auto",
+              "spanNulls": false,
+              "stacking": {
+                "group": "A",
+                "mode": "none"
+              },
+              "thresholdsStyle": {
+                "mode": "off"
+              }
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": 0
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            }
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 8,
+          "w": 12,
+          "x": 0,
+          "y": 0
+        },
+        "id": 1,
+        "options": {
+          "legend": {
+            "calcs": [],
+            "displayMode": "list",
+            "placement": "bottom",
+            "showLegend": true
+          },
+          "tooltip": {
+            "hideZeros": false,
+            "mode": "single",
+            "sort": "none"
+          }
+        },
+        "pluginVersion": "12.1.0-pre",
+        "targets": [
+          {
+            "refId": "A"
+          }
+        ],
+        "title": "New panel",
+        "type": "timeseries"
+      }
+    ],
+    "preload": false,
+    "schemaVersion": 41,
+    "tags": [],
+    "templating": {
+      "list": []
+    },
+    "time": {
+      "from": "now-6h",
+      "to": "now"
+    },
+    "timepicker": {},
+    "timezone": "browser",
+    "title": "Test: V1 dashboard with annotations",
+    "version": 8
+  }
+}
diff --git a/packages/grafana-schema/src/schema/dashboard/v2alpha1/types.spec.gen.ts b/packages/grafana-schema/src/schema/dashboard/v2alpha1/types.spec.gen.ts
index 0075a197ffa..61b29e2ee2e 100644
--- a/packages/grafana-schema/src/schema/dashboard/v2alpha1/types.spec.gen.ts
+++ b/packages/grafana-schema/src/schema/dashboard/v2alpha1/types.spec.gen.ts
@@ -18,7 +18,7 @@ export interface AnnotationQuerySpec {
 	name: string;
 	builtIn?: boolean;
 	filter?: AnnotationPanelFilter;
-	// Catch-all field for datasource-specific properties
+	// Catch-all field for datasource-specific properties. Should not be available in as code tooling.
 	legacyOptions?: Record<string, any>;
 }
 
diff --git a/pkg/tests/apis/openapi_snapshots/dashboard.grafana.app-v2alpha1.json b/pkg/tests/apis/openapi_snapshots/dashboard.grafana.app-v2alpha1.json
index a5262d3e078..f59c4667769 100644
--- a/pkg/tests/apis/openapi_snapshots/dashboard.grafana.app-v2alpha1.json
+++ b/pkg/tests/apis/openapi_snapshots/dashboard.grafana.app-v2alpha1.json
@@ -1276,7 +1276,7 @@
             "default": ""
           },
           "legacyOptions": {
-            "description": "Catch-all field for datasource-specific properties",
+            "description": "Catch-all field for datasource-specific properties. Should not be available in as code tooling.",
             "type": "object",
             "additionalProperties": {
               "type": "object"
diff --git a/public/app/features/dashboard-scene/serialization/DashboardSceneSerializer.test.ts b/public/app/features/dashboard-scene/serialization/DashboardSceneSerializer.test.ts
index ab99200417d..4157352dd3a 100644
--- a/public/app/features/dashboard-scene/serialization/DashboardSceneSerializer.test.ts
+++ b/public/app/features/dashboard-scene/serialization/DashboardSceneSerializer.test.ts
@@ -14,7 +14,9 @@ import {
   defaultPanelSpec,
   defaultTimeSettingsSpec,
   GridLayoutKind,
+  PanelKind,
   PanelSpec,
+  QueryVariableKind,
 } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen';
 import { DEFAULT_ANNOTATION_COLOR } from '@grafana/ui';
 import { AnnoKeyDashboardSnapshotOriginalUrl } from 'app/features/apiserver/types';
@@ -48,11 +50,13 @@ jest.mock('@grafana/runtime', () => ({
             name: 'Grafana',
             meta: { id: 'grafana' },
             type: 'datasource',
+            uid: 'grafana',
           },
           prometheus: {
             name: 'prometheus',
             meta: { id: 'prometheus' },
             type: 'datasource',
+            uid: 'prometheus-uid',
           },
         },
       },
@@ -890,6 +894,226 @@ describe('DashboardSceneSerializer', () => {
           },
         });
       });
+
+      describe('data source references persistence', () => {
+        it('should not fill data source references for annotations when input did not contain it', () => {
+          const dashboard = setupV2({
+            annotations: [
+              {
+                kind: 'AnnotationQuery',
+                spec: {
+                  builtIn: false,
+                  enable: true,
+                  hide: false,
+                  iconColor: 'blue',
+                  name: 'prom-annotations',
+                  query: {
+                    group: 'prometheus',
+                    kind: 'DataQuery',
+                    spec: {
+                      refId: 'Anno',
+                    },
+                    version: 'v0',
+                  },
+                },
+              },
+            ],
+          });
+          const saveAsModel = serializer.getSaveAsModel(dashboard, baseOptions);
+          // referencing index 1 as transformation adds built in annotation query
+          expect(saveAsModel.annotations[1].spec.query.datasource).toBeUndefined();
+        });
+
+        it('should fill data source references for annotations when input did contain it', () => {
+          const dashboard = setupV2({
+            annotations: [
+              {
+                kind: 'AnnotationQuery',
+                spec: {
+                  builtIn: false,
+                  enable: true,
+                  hide: false,
+                  iconColor: 'blue',
+                  name: 'prom-annotations',
+                  query: {
+                    group: 'prometheus',
+                    kind: 'DataQuery',
+                    datasource: {
+                      name: 'prometheus-uid',
+                    },
+                    spec: {
+                      refId: 'Anno',
+                    },
+                    version: 'v0',
+                  },
+                },
+              },
+            ],
+          });
+          const saveAsModel = serializer.getSaveAsModel(dashboard, baseOptions);
+          // referencing index 1 as transformation adds built in annotation query
+          expect(saveAsModel.annotations[1].spec.query.datasource).toEqual({
+            name: 'prometheus-uid',
+          });
+        });
+        it('should not fill data source references for panel queries when input did not contain it', () => {
+          const dashboard = setupV2({
+            elements: {
+              'panel-1': {
+                kind: 'Panel',
+                spec: {
+                  ...defaultPanelSpec(),
+                  data: {
+                    kind: 'QueryGroup',
+                    spec: {
+                      transformations: [],
+                      queryOptions: {},
+                      queries: [
+                        {
+                          kind: 'PanelQuery',
+                          spec: {
+                            refId: 'A',
+                            hidden: false,
+                            query: {
+                              kind: 'DataQuery',
+                              group: 'prometheus',
+                              version: 'v0',
+                              spec: {},
+                            },
+                          },
+                        },
+                      ],
+                    },
+                  },
+                },
+              },
+            },
+          });
+          const saveAsModel = serializer.getSaveAsModel(dashboard, baseOptions);
+          expect(
+            (saveAsModel.elements['panel-1'] as PanelKind).spec.data.spec.queries[0].spec.query.datasource
+          ).toBeUndefined();
+        });
+
+        it('should fill data source references for panel queries when input did contain it', () => {
+          const dashboard = setupV2({
+            elements: {
+              'panel-1': {
+                kind: 'Panel',
+                spec: {
+                  ...defaultPanelSpec(),
+                  data: {
+                    kind: 'QueryGroup',
+                    spec: {
+                      transformations: [],
+                      queryOptions: {},
+                      queries: [
+                        {
+                          kind: 'PanelQuery',
+                          spec: {
+                            refId: 'A',
+                            hidden: false,
+                            query: {
+                              kind: 'DataQuery',
+                              group: 'prometheus',
+                              version: 'v0',
+                              datasource: {
+                                name: 'prometheus-uid',
+                              },
+                              spec: {},
+                            },
+                          },
+                        },
+                      ],
+                    },
+                  },
+                },
+              },
+            },
+          });
+          const saveAsModel = serializer.getSaveAsModel(dashboard, baseOptions);
+          expect(
+            (saveAsModel.elements['panel-1'] as PanelKind).spec.data.spec.queries[0].spec.query.datasource
+          ).toEqual({
+            name: 'prometheus-uid',
+          });
+        });
+
+        it('should not fill data source references for query variables when input did contain it', () => {
+          const queryVariable: QueryVariableKind = {
+            kind: 'QueryVariable',
+            spec: {
+              name: 'app',
+              current: {
+                text: 'app1',
+                value: 'app1',
+              },
+              hide: 'dontHide',
+              includeAll: false,
+              label: 'Query Variable',
+              skipUrlSync: false,
+              regex: '',
+              definition: '',
+              options: [],
+              refresh: 'never',
+              sort: 'alphabeticalAsc',
+              multi: false,
+              allowCustomValue: true,
+              query: {
+                kind: 'DataQuery',
+                group: 'prometheus',
+                version: 'v0',
+                spec: {},
+              },
+            },
+          };
+          const dashboard = setupV2({
+            variables: [queryVariable],
+          });
+          const saveAsModel = serializer.getSaveAsModel(dashboard, baseOptions);
+          expect((saveAsModel.variables[0] as QueryVariableKind).spec.query.datasource).toBeUndefined();
+        });
+
+        it('should fill data source references for query variables when input did contain it', () => {
+          const queryVariable: QueryVariableKind = {
+            kind: 'QueryVariable',
+            spec: {
+              name: 'app',
+              current: {
+                text: 'app1',
+                value: 'app1',
+              },
+              hide: 'dontHide',
+              includeAll: false,
+              label: 'Query Variable',
+              skipUrlSync: false,
+              regex: '',
+              definition: '',
+              options: [],
+              refresh: 'never',
+              sort: 'alphabeticalAsc',
+              multi: false,
+              allowCustomValue: true,
+              query: {
+                kind: 'DataQuery',
+                group: 'prometheus',
+                version: 'v0',
+                datasource: {
+                  name: 'prometheus-uid',
+                },
+                spec: {},
+              },
+            },
+          };
+          const dashboard = setupV2({
+            variables: [queryVariable],
+          });
+          const saveAsModel = serializer.getSaveAsModel(dashboard, baseOptions);
+          expect((saveAsModel.variables[0] as QueryVariableKind).spec.query.datasource).toEqual({
+            name: 'prometheus-uid',
+          });
+        });
+      });
     });
 
     describe('panel mapping methods', () => {
diff --git a/public/app/features/dashboard-scene/serialization/annotations.test.ts b/public/app/features/dashboard-scene/serialization/annotations.test.ts
new file mode 100644
index 00000000000..f054c7a22a3
--- /dev/null
+++ b/public/app/features/dashboard-scene/serialization/annotations.test.ts
@@ -0,0 +1,226 @@
+import { AnnotationQuery } from '@grafana/data';
+import { AnnotationQueryKind } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen';
+
+import { transformV1ToV2AnnotationQuery, transformV2ToV1AnnotationQuery } from './annotations';
+
+describe('V1<->V2 annotation convertions', () => {
+  test('given grafana-built in annotations', () => {
+    // test case
+    const annotationDefinition: AnnotationQuery = {
+      builtIn: 1,
+      datasource: {
+        type: 'grafana',
+        uid: 'grafana',
+      },
+      enable: true,
+      hide: false,
+      iconColor: 'yellow',
+      name: 'Annotations \u0026 Alerts',
+      target: {
+        // @ts-expect-error
+        limit: 100,
+        matchAny: false,
+        tags: [],
+        type: 'dashboard',
+      },
+      type: 'dashboard',
+    };
+
+    const expectedV2: AnnotationQueryKind = {
+      kind: 'AnnotationQuery',
+      spec: {
+        builtIn: true,
+        enable: true,
+        hide: false,
+        iconColor: 'yellow',
+        name: 'Annotations \u0026 Alerts',
+        query: {
+          kind: 'DataQuery',
+          group: 'grafana',
+          version: 'v0',
+          datasource: {
+            name: 'grafana',
+          },
+          spec: {
+            limit: 100,
+            matchAny: false,
+            tags: [],
+            type: 'dashboard',
+          },
+        },
+      },
+    };
+
+    const resultV2: AnnotationQueryKind = transformV1ToV2AnnotationQuery(annotationDefinition, 'grafana', 'grafana');
+
+    expect(resultV2).toEqual(expectedV2);
+
+    const resultV1: AnnotationQuery = transformV2ToV1AnnotationQuery(expectedV2);
+    expect(resultV1).toEqual(annotationDefinition);
+  });
+
+  test('given annotations with datasource', () => {
+    const annotationDefinition = {
+      datasource: {
+        type: 'grafana-testdata-datasource',
+        uid: 'uid',
+      },
+      enable: true,
+      hide: false,
+      iconColor: 'blue',
+      name: 'testdata-annos',
+      target: {
+        lines: 10,
+        refId: 'Anno',
+        scenarioId: 'annotations',
+      },
+    };
+
+    const expectedV2: AnnotationQueryKind = {
+      kind: 'AnnotationQuery',
+      spec: {
+        enable: true,
+        hide: false,
+        iconColor: 'blue',
+        name: 'testdata-annos',
+        builtIn: false,
+        query: {
+          kind: 'DataQuery',
+          group: 'grafana-testdata-datasource',
+          version: 'v0',
+          datasource: {
+            name: 'uid',
+          },
+          spec: {
+            lines: 10,
+            refId: 'Anno',
+            scenarioId: 'annotations',
+          },
+        },
+      },
+    };
+
+    const resultV2: AnnotationQueryKind = transformV1ToV2AnnotationQuery(
+      annotationDefinition,
+      'grafana-testdata-datasource',
+      'uid'
+    );
+
+    expect(resultV2).toEqual(expectedV2);
+
+    const resultV1: AnnotationQuery = transformV2ToV1AnnotationQuery(expectedV2);
+    expect(resultV1).toEqual(annotationDefinition);
+  });
+
+  test('given annotations with target', () => {
+    const annotationDefinition = {
+      datasource: {
+        type: 'prometheus',
+        uid: 'uid',
+      },
+      enable: true,
+      hide: false,
+      iconColor: 'yellow',
+      name: 'prom-annos',
+      target: {
+        expr: '{action="add_client"}',
+        interval: '',
+        lines: 10,
+        refId: 'Anno',
+        scenarioId: 'annotations',
+      },
+    };
+
+    const expectedV2: AnnotationQueryKind = {
+      kind: 'AnnotationQuery',
+      spec: {
+        enable: true,
+        hide: false,
+        iconColor: 'yellow',
+        name: 'prom-annos',
+        builtIn: false,
+        query: {
+          kind: 'DataQuery',
+          group: 'prometheus',
+          version: 'v0',
+          datasource: {
+            name: 'uid',
+          },
+          spec: {
+            expr: '{action="add_client"}',
+            interval: '',
+            lines: 10,
+            refId: 'Anno',
+            scenarioId: 'annotations',
+          },
+        },
+      },
+    };
+
+    const resultV2: AnnotationQueryKind = transformV1ToV2AnnotationQuery(annotationDefinition, 'prometheus', 'uid');
+    expect(resultV2).toEqual(expectedV2);
+
+    const resultV1: AnnotationQuery = transformV2ToV1AnnotationQuery(expectedV2);
+    expect(resultV1).toEqual(annotationDefinition);
+  });
+
+  test('given annotations with non-schematised options / legacyOptions', () => {
+    const annotationDefinition = {
+      datasource: {
+        type: 'elasticsearch',
+        uid: 'uid',
+      },
+      enable: true,
+      hide: false,
+      iconColor: 'red',
+      name: 'elastic - annos',
+      tagsField: 'asd',
+      target: {
+        lines: 10,
+        query: 'test query',
+        refId: 'Anno',
+        scenarioId: 'annotations',
+      },
+      textField: 'asd',
+      timeEndField: 'asdas',
+      timeField: 'asd',
+    };
+
+    const expectedV2: AnnotationQueryKind = {
+      kind: 'AnnotationQuery',
+      spec: {
+        enable: true,
+        hide: false,
+        iconColor: 'red',
+        name: 'elastic - annos',
+        builtIn: false,
+        query: {
+          kind: 'DataQuery',
+          group: 'elasticsearch',
+          version: 'v0',
+          datasource: {
+            name: 'uid',
+          },
+          spec: {
+            lines: 10,
+            query: 'test query',
+            refId: 'Anno',
+            scenarioId: 'annotations',
+          },
+        },
+        legacyOptions: {
+          tagsField: 'asd',
+          textField: 'asd',
+          timeEndField: 'asdas',
+          timeField: 'asd',
+        },
+      },
+    };
+
+    const resultV2: AnnotationQueryKind = transformV1ToV2AnnotationQuery(annotationDefinition, 'elasticsearch', 'uid');
+    expect(resultV2).toEqual(expectedV2);
+
+    const resultV1: AnnotationQuery = transformV2ToV1AnnotationQuery(expectedV2);
+    expect(resultV1).toEqual(annotationDefinition);
+  });
+});
diff --git a/public/app/features/dashboard-scene/serialization/annotations.ts b/public/app/features/dashboard-scene/serialization/annotations.ts
new file mode 100644
index 00000000000..7fba058df19
--- /dev/null
+++ b/public/app/features/dashboard-scene/serialization/annotations.ts
@@ -0,0 +1,118 @@
+import { AnnotationQuery } from '@grafana/data';
+import {
+  AnnotationQueryKind,
+  defaultDataQueryKind,
+} from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen';
+
+import { getRuntimePanelDataSource } from './layoutSerializers/utils';
+
+export function transformV1ToV2AnnotationQuery(
+  annotation: AnnotationQuery,
+
+  dsType: string,
+  dsUID?: string,
+  // Overrides are used to provide properties based on scene's annotations data layer object state
+  override?: Partial<AnnotationQuery>
+): AnnotationQueryKind {
+  const group = annotation.builtIn ? 'grafana' : dsType;
+
+  const {
+    // known properties documented in v1 schema
+    enable,
+    hide,
+    iconColor,
+    name,
+    builtIn,
+    filter,
+    mappings,
+    datasource,
+    target,
+    snapshotData,
+    type,
+
+    // unknown properties that are still available for configuration through API
+    ...legacyOptions
+  } = annotation;
+
+  const result: AnnotationQueryKind = {
+    kind: 'AnnotationQuery',
+    spec: {
+      builtIn: Boolean(annotation.builtIn),
+      name: annotation.name,
+      enable: Boolean(override?.enable) || Boolean(annotation.enable),
+      hide: Boolean(override?.hide) || Boolean(annotation.hide),
+      iconColor: annotation.iconColor,
+
+      query: {
+        kind: 'DataQuery',
+        version: defaultDataQueryKind().version,
+        group, // Annotation layer has a datasource type provided in runtime.
+        spec: target || {},
+      },
+    },
+  };
+
+  if (dsUID) {
+    result.spec.query.datasource = {
+      name: dsUID,
+    };
+  }
+
+  // if legacy options is not an empty object, add it to the result
+  if (Object.keys(legacyOptions).length > 0) {
+    result.spec.legacyOptions = legacyOptions;
+  }
+
+  if (annotation.filter?.ids?.length) {
+    result.spec.filter = annotation.filter;
+  }
+
+  // TODO: add mappings
+
+  return result;
+}
+
+export function transformV2ToV1AnnotationQuery(annotation: AnnotationQueryKind): AnnotationQuery {
+  let { query: dataQuery, ...annotationQuery } = annotation.spec;
+
+  // Mapping from AnnotationQueryKind to AnnotationQuery used by scenes.
+  let annoQuerySpec: AnnotationQuery = {
+    enable: annotation.spec.enable,
+    hide: annotation.spec.hide,
+    iconColor: annotation.spec.iconColor,
+    name: annotation.spec.name,
+    // TOOO: mappings
+  };
+
+  if (Object.keys(dataQuery.spec).length > 0) {
+    // @ts-expect-error DataQueryKind spec should be typed as DataQuery interface
+    annoQuerySpec.target = {
+      ...dataQuery?.spec,
+    };
+  }
+
+  if (annotation.spec.builtIn) {
+    annoQuerySpec.type = 'dashboard';
+    annoQuerySpec.builtIn = 1;
+  }
+
+  if (annotation.spec.filter) {
+    annoQuerySpec.filter = annotation.spec.filter;
+  }
+
+  // some annotations will contain in the legacyOptions properties that need to be
+  // added to the root level AnnotationQuery
+  if (annotationQuery.legacyOptions) {
+    annoQuerySpec = {
+      ...annoQuerySpec,
+      ...annotationQuery.legacyOptions,
+    };
+  }
+
+  // get data source from annotation query
+  const datasource = getRuntimePanelDataSource(dataQuery);
+
+  annoQuerySpec.datasource = datasource;
+
+  return annoQuerySpec;
+}
diff --git a/public/app/features/dashboard-scene/serialization/transformSaveModelSchemaV2ToScene.test.ts b/public/app/features/dashboard-scene/serialization/transformSaveModelSchemaV2ToScene.test.ts
index c78cbd4c480..07f1359bc7a 100644
--- a/public/app/features/dashboard-scene/serialization/transformSaveModelSchemaV2ToScene.test.ts
+++ b/public/app/features/dashboard-scene/serialization/transformSaveModelSchemaV2ToScene.test.ts
@@ -781,8 +781,8 @@ describe('transformSaveModelSchemaV2ToScene', () => {
         enable: true,
         iconColor: 'rgba(0, 211, 255, 1)',
         name: 'Annotations & Alerts',
-        filter: undefined,
         hide: true,
+        type: 'dashboard',
       });
 
       const annotationLayer = dataLayerSet.state.annotationLayers[1] as DashboardAnnotationsDataLayer;
@@ -794,7 +794,6 @@ describe('transformSaveModelSchemaV2ToScene', () => {
           type: 'prometheus',
         },
         name: 'Annotation with legacy options',
-        builtIn: 0,
         enable: true,
         hide: false,
         iconColor: 'purple',
@@ -804,15 +803,6 @@ describe('transformSaveModelSchemaV2ToScene', () => {
         useValueAsTime: true,
         step: '1m',
       });
-
-      // Verify the original legacyOptions object is also preserved
-      expect(annotationLayer.state.query.legacyOptions).toMatchObject({
-        expr: 'rate(http_requests_total[5m])',
-        queryType: 'range',
-        legendFormat: '{{method}} {{endpoint}}',
-        useValueAsTime: true,
-        step: '1m',
-      });
     });
   });
 });
diff --git a/public/app/features/dashboard-scene/serialization/transformSaveModelSchemaV2ToScene.ts b/public/app/features/dashboard-scene/serialization/transformSaveModelSchemaV2ToScene.ts
index 5d73b6cab9e..f37598bb45e 100644
--- a/public/app/features/dashboard-scene/serialization/transformSaveModelSchemaV2ToScene.ts
+++ b/public/app/features/dashboard-scene/serialization/transformSaveModelSchemaV2ToScene.ts
@@ -1,6 +1,5 @@
 import { uniqueId } from 'lodash';
 
-import { AnnotationQuery } from '@grafana/data';
 import { config, getDataSourceSrv } from '@grafana/runtime';
 import {
   AdHocFiltersVariable,
@@ -64,9 +63,10 @@ import { DashboardScene } from '../scene/DashboardScene';
 import { DashboardLayoutManager } from '../scene/types/DashboardLayoutManager';
 import { getIntervalsFromQueryString } from '../utils/utils';
 
+import { transformV2ToV1AnnotationQuery } from './annotations';
 import { SnapshotVariable } from './custom-variables/SnapshotVariable';
 import { layoutDeserializerRegistry } from './layoutSerializers/layoutSerializerRegistry';
-import { getRuntimePanelDataSource, getRuntimeVariableDataSource } from './layoutSerializers/utils';
+import { getRuntimeVariableDataSource } from './layoutSerializers/utils';
 import { registerPanelInteractionsReporter } from './transformSaveModelToScene';
 import {
   transformCursorSyncV2ToV1,
@@ -92,47 +92,17 @@ export function transformSaveModelSchemaV2ToScene(dto: DashboardWithAccessInfo<D
   const { spec: dashboard, metadata, apiVersion } = dto;
 
   // annotations might not come with the builtIn Grafana annotation, we need to add it
-
   const grafanaBuiltAnnotation = getGrafanaBuiltInAnnotationDataLayer(dashboard);
   if (grafanaBuiltAnnotation) {
     dashboard.annotations.unshift(grafanaBuiltAnnotation);
   }
 
   const annotationLayers = dashboard.annotations.map((annotation) => {
-    let { query: dataQuery, ...annotationQuery } = annotation.spec;
-
-    // Mapping from AnnotationQueryKind to AnnotationQuery used by scenes.
-    let annoQuerySpec: AnnotationQuery = {
-      builtIn: annotation.spec.builtIn ? 1 : 0,
-      enable: annotation.spec.enable,
-      iconColor: annotation.spec.iconColor,
-      name: annotation.spec.name,
-      filter: annotation.spec.filter,
-      hide: annotation.spec.hide,
-      ...dataQuery?.spec,
-    };
-
-    // some annotations will contain in the legacyOptions properties that need to be
-    // added to the root level annotation spec
-    if (annotationQuery.legacyOptions) {
-      annoQuerySpec = {
-        ...annoQuerySpec,
-        ...annotationQuery.legacyOptions,
-        legacyOptions: {
-          ...annotationQuery.legacyOptions,
-        },
-      };
-    }
-
-    // get data source from annotation query
-    const datasource = getRuntimePanelDataSource(dataQuery);
+    const annotationQuerySpec = transformV2ToV1AnnotationQuery(annotation);
 
     const layerState = {
       key: uniqueId('annotations-'),
-      query: {
-        ...annoQuerySpec,
-        datasource,
-      },
+      query: annotationQuerySpec,
       name: annotation.spec.name,
       isEnabled: Boolean(annotation.spec.enable),
       isHidden: Boolean(annotation.spec.hide),
diff --git a/public/app/features/dashboard-scene/serialization/transformSceneToSaveModelSchemaV2.test.ts b/public/app/features/dashboard-scene/serialization/transformSceneToSaveModelSchemaV2.test.ts
index ad6137da1e5..94c7aae659a 100644
--- a/public/app/features/dashboard-scene/serialization/transformSceneToSaveModelSchemaV2.test.ts
+++ b/public/app/features/dashboard-scene/serialization/transformSceneToSaveModelSchemaV2.test.ts
@@ -561,16 +561,8 @@ describe('transformSceneToSaveModelSchemaV2', () => {
         name: 'annotation-with-options',
         enable: true,
         iconColor: 'red',
-        legacyOptions: {
-          expr: 'rate(http_requests_total[5m])',
-          queryType: 'range',
-          legendFormat: '{{method}} {{endpoint}}',
-          useValueAsTime: true,
-        },
-        // Some other properties that aren't in the annotation spec
-        // and should be moved to options
-        customProp1: 'value1',
-        customProp2: 'value2',
+        customProp1: true,
+        customProp2: 'test',
       },
       name: 'layerWithOptions',
       isEnabled: true,
@@ -592,19 +584,11 @@ describe('transformSceneToSaveModelSchemaV2', () => {
     expect(result.annotations.length).toBe(1);
     expect(result.annotations[0].spec.legacyOptions).toBeDefined();
     expect(result.annotations[0].spec.legacyOptions).toEqual({
-      expr: 'rate(http_requests_total[5m])',
-      queryType: 'range',
-      legendFormat: '{{method}} {{endpoint}}',
-      useValueAsTime: true,
-      customProp1: 'value1',
-      customProp2: 'value2',
+      customProp1: true,
+      customProp2: 'test',
     });
 
     // Ensure these properties are not at the root level
-    expect(result).not.toHaveProperty('annotations[0].spec.expr');
-    expect(result).not.toHaveProperty('annotations[0].spec.queryType');
-    expect(result).not.toHaveProperty('annotations[0].spec.legendFormat');
-    expect(result).not.toHaveProperty('annotations[0].spec.useValueAsTime');
     expect(result).not.toHaveProperty('annotations[0].spec.customProp1');
     expect(result).not.toHaveProperty('annotations[0].spec.customProp2');
   });
diff --git a/public/app/features/dashboard-scene/serialization/transformSceneToSaveModelSchemaV2.ts b/public/app/features/dashboard-scene/serialization/transformSceneToSaveModelSchemaV2.ts
index a7682c4e559..0dae10574b6 100644
--- a/public/app/features/dashboard-scene/serialization/transformSceneToSaveModelSchemaV2.ts
+++ b/public/app/features/dashboard-scene/serialization/transformSceneToSaveModelSchemaV2.ts
@@ -52,6 +52,7 @@ import { dashboardSceneGraph } from '../utils/dashboardSceneGraph';
 import { getLibraryPanelBehavior, getPanelIdForVizPanel, getQueryRunnerFor, isLibraryPanel } from '../utils/utils';
 
 import { DSReferencesMapping } from './DashboardSceneSerializer';
+import { transformV1ToV2AnnotationQuery } from './annotations';
 import { sceneVariablesSetToSchemaV2Variables } from './sceneVariablesSetToVariables';
 import { colorIdEnumToColorIdV2, transformCursorSynctoEnum } from './transformToV2TypesUtils';
 
@@ -418,114 +419,46 @@ function getAnnotations(state: DashboardSceneState, dsReferencesMapping?: DSRefe
     if (!(layer instanceof dataLayers.AnnotationsDataLayer)) {
       continue;
     }
+
     const datasource = getElementDatasource(layer, layer.state.query, 'annotation', undefined, dsReferencesMapping);
 
-    const layerDs = layer.state.query.datasource;
+    let layerDs = layer.state.query.datasource;
+
     if (!layerDs) {
-      throw new Error('Misconfigured AnnotationsDataLayer: Datasource is required for annotations');
+      // This can happen only if we are transforming a scene that was created
+      // from a v1 spec. In v1 annotation layer can contain no datasource ref, which is guaranteed
+      // for layers created for v2 schema. See transform transformSaveModelSchemaV2ToScene.ts.
+      // In this case we will resolve default data source
+      layerDs = getDefaultDataSourceRef();
+      console.error(
+        'Misconfigured AnnotationsDataLayer: Data source is required for annotations. Resolving default data source',
+        layer,
+        layerDs
+      );
     }
 
-    const result: AnnotationQueryKind = {
-      kind: 'AnnotationQuery',
-      spec: {
-        builtIn: Boolean(layer.state.query.builtIn),
-        name: layer.state.query.name,
-        enable: Boolean(layer.state.isEnabled),
-        hide: Boolean(layer.state.isHidden),
-        iconColor: layer.state.query.iconColor,
-        query: {
-          kind: 'DataQuery',
-          version: defaultDataQueryKind().version,
-          group: layerDs.type!, // Annotation layer has a datasource type provided in runtime.
-          spec: {},
-        },
-      },
-    };
+    const result = transformV1ToV2AnnotationQuery(layer.state.query, layerDs.type!, layerDs.uid!, {
+      enable: layer.state.isEnabled,
+      hide: layer.state.isHidden,
+    });
 
-    if (datasource) {
-      result.spec.query!.datasource = {
-        name: datasource.uid,
-      };
-    }
-
-    // Transform v1 dashboard (using target) to v2 structure
-    // adds extra condition to prioritize query over target
-    // if query is defined, use it
-    if (layer.state.query.target && !layer.state.query.query) {
-      // Handle built-in annotations
-      if (layer.state.query.builtIn) {
-        result.spec.query = {
-          kind: 'DataQuery',
-          version: defaultDataQueryKind().version,
-          group: 'grafana', // built-in annotations are always of type grafana
-          spec: {
-            ...layer.state.query.target,
-          },
-        };
-      } else {
-        result.spec.query = {
-          kind: 'DataQuery',
-          version: defaultDataQueryKind().version,
-          group: datasource?.type!,
-          spec: {
-            ...layer.state.query.target,
-          },
-        };
-
-        if (layer.state.query.datasource?.uid) {
-          result.spec.query.datasource = {
-            name: layer.state.query.datasource?.uid,
-          };
-        }
-      }
-    }
-    // For annotations without query.query defined (e.g., grafana annotations without tags)
-    else if (layer.state.query.query?.kind) {
-      result.spec.query = {
-        kind: 'DataQuery',
-        version: defaultDataQueryKind().version,
-        group: layer.state.query.query.group || getAnnotationQueryKind(layer.state.query),
-        datasource: layer.state.query.query.datasource,
-        spec: {
-          ...layer.state.query.query.spec,
-        },
-      };
-    }
-    // Collect datasource-specific properties not in standard annotation spec
-    let otherProps = omit(
-      layer.state.query,
-      'type',
-      'target',
-      'builtIn',
-      'name',
-      'datasource',
-      'iconColor',
-      'enable',
-      'hide',
-      'filter',
-      'query'
-    );
-
-    // Store extra properties in the legacyOptions field instead of directly in the spec
-    if (Object.keys(otherProps).length > 0) {
-      // // Extract options property and get the rest of the properties
-      const { legacyOptions, ...restProps } = otherProps;
-      if (legacyOptions) {
-        // Merge options with the rest of the properties
-        result.spec.legacyOptions = { ...legacyOptions, ...restProps };
-      }
-      result.spec.query!.spec = {
-        ...otherProps,
-      };
-    }
+    const annotationQuery = layer.state.query;
 
     // If filter is an empty array, don't save it
-    if (layer.state.query.filter?.ids?.length) {
-      result.spec.filter = layer.state.query.filter;
+    if (annotationQuery.filter?.ids?.length) {
+      result.spec.filter = annotationQuery.filter;
+    }
+
+    // Finally, if the datasource references mapping did not containt data source ref,
+    // this means that the original model that was fetched did not contain it. In such scenario we don't want to save
+    // the explicit data source reference, so lets remove it from the save model.
+    if (!datasource) {
+      delete result.spec.query.datasource;
     }
 
     annotations.push(result);
   }
+
   return annotations;
 }
 
diff --git a/public/app/features/dashboard/api/ResponseTransformers.test.ts b/public/app/features/dashboard/api/ResponseTransformers.test.ts
index f4c633f5430..432aaa300c6 100644
--- a/public/app/features/dashboard/api/ResponseTransformers.test.ts
+++ b/public/app/features/dashboard/api/ResponseTransformers.test.ts
@@ -1016,15 +1016,14 @@ describe('ResponseTransformers', () => {
 
   function validateAnnotation(v1: AnnotationQuery, v2: DashboardV2Spec['annotations'][0]) {
     const { spec: v2Spec } = v2;
-
     expect(v1.name).toBe(v2Spec.name);
-    expect(v1.datasource?.type).toBe(v2Spec.query?.spec.group);
-    expect(v1.datasource?.uid).toBe(v2Spec.query?.spec.datasource?.name);
+    expect(v1.datasource?.type).toBe(v2Spec.query.group);
+    expect(v1.datasource?.uid).toBe(v2Spec.query.datasource?.name);
     expect(v1.enable).toBe(v2Spec.enable);
     expect(v1.hide).toBe(v2Spec.hide);
     expect(v1.iconColor).toBe(v2Spec.iconColor);
-    expect(v1.builtIn).toBe(v2Spec.builtIn ? 1 : 0);
-    expect(v1.target).toBe(v2Spec.query?.spec);
+    expect(v1.builtIn).toBe(v2Spec.builtIn ? 1 : undefined);
+    expect(v1.target).toEqual(v2Spec.query.spec);
     expect(v1.filter).toEqual(v2Spec.filter);
   }
 
diff --git a/public/app/features/dashboard/api/ResponseTransformers.ts b/public/app/features/dashboard/api/ResponseTransformers.ts
index e440cd63b99..66dbbb8fdec 100644
--- a/public/app/features/dashboard/api/ResponseTransformers.ts
+++ b/public/app/features/dashboard/api/ResponseTransformers.ts
@@ -56,6 +56,7 @@ import {
   DeprecatedInternalId,
   ObjectMeta,
 } from 'app/features/apiserver/types';
+import { transformV2ToV1AnnotationQuery } from 'app/features/dashboard-scene/serialization/annotations';
 import { GRID_ROW_HEIGHT } from 'app/features/dashboard-scene/serialization/const';
 import { validateFiltersOrigin } from 'app/features/dashboard-scene/serialization/sceneVariablesSetToVariables';
 import { TypedVariableModelV2 } from 'app/features/dashboard-scene/serialization/transformSaveModelSchemaV2ToScene';
@@ -892,25 +893,6 @@ function getVariablesV1(vars: DashboardV2Spec['variables']): VariableModel[] {
   return variables;
 }
 
-function getAnnotationsV1(annotations: DashboardV2Spec['annotations']): AnnotationQuery[] {
-  // @ts-expect-error - target v2 query is not compatible with v1 target
-  return annotations.map((a) => {
-    return {
-      name: a.spec.name,
-      datasource: {
-        type: a.spec.query?.spec.group,
-        uid: a.spec.query?.spec.datasource?.name,
-      },
-      enable: a.spec.enable,
-      hide: a.spec.hide,
-      iconColor: a.spec.iconColor,
-      builtIn: a.spec.builtIn ? 1 : 0,
-      target: a.spec.query?.spec,
-      filter: a.spec.filter,
-    };
-  });
-}
-
 interface LibraryPanelDTO extends Pick<Panel, 'libraryPanel' | 'id' | 'title' | 'gridPos' | 'type'> {}
 
 function getPanelsV1(
@@ -1158,7 +1140,8 @@ function transformToV1VariableTypes(variable: TypedVariableModelV2): VariableTyp
 }
 
 export function transformDashboardV2SpecToV1(spec: DashboardV2Spec, metadata: ObjectMeta): DashboardDataDTO {
-  const annotations = getAnnotationsV1(spec.annotations);
+  const annotations = spec.annotations.map(transformV2ToV1AnnotationQuery);
+
   const variables = getVariablesV1(spec.variables);
   const panels = getPanelsV1(spec.elements, spec.layout);
   return {

From 6c1ff3250156c39b4d0028ee5a65a2ab84103d07 Mon Sep 17 00:00:00 2001
From: Hugo Kiyodi Oshiro <hugo.oshiro@grafana.com>
Date: Tue, 8 Jul 2025 14:52:02 +0200
Subject: [PATCH 16/21] Plugins: Improve levitate report on forks (#107252)

---
 .github/workflows/detect-breaking-changes-levitate.yml | 4 ++++
 scripts/check-breaking-changes.sh                      | 4 ++++
 scripts/levitate-parse-json-report.js                  | 5 ++++-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/detect-breaking-changes-levitate.yml b/.github/workflows/detect-breaking-changes-levitate.yml
index a4328970ff7..c738c18bbac 100644
--- a/.github/workflows/detect-breaking-changes-levitate.yml
+++ b/.github/workflows/detect-breaking-changes-levitate.yml
@@ -158,6 +158,7 @@ jobs:
 
       - id: 'auth'
         uses: 'google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f'
+        if: github.event.pull_request.head.repo.full_name == github.repository
         with:
           workload_identity_provider: projects/304398677251/locations/global/workloadIdentityPools/github/providers/github-provider
           service_account: github-plugins-data-levitate@grafanalabs-workload-identity.iam.gserviceaccount.com
@@ -165,6 +166,7 @@ jobs:
 
       - name: 'Set up Cloud SDK'
         uses: 'google-github-actions/setup-gcloud@6189d56e4096ee891640bb02ac264be376592d6a'
+        if: github.event.pull_request.head.repo.full_name == github.repository
         with:
           version: '>= 363.0.0'
           project_id: 'grafanalabs-global'
@@ -175,6 +177,7 @@ jobs:
         run: ./scripts/check-breaking-changes.sh
         env:
           FORCE_COLOR: 3
+          IS_FORK: ${{ github.event.pull_request.head.repo.full_name != github.repository }} # used in check-breaking-changes.sh and levitate-parse-json-report.js
 
       - name: Persisting the check output
         run: |
@@ -199,6 +202,7 @@ jobs:
     permissions:
       contents: read
       id-token: write
+    if: github.event.pull_request.head.repo.full_name == github.repository
 
     steps:
       - id: get-secrets
diff --git a/scripts/check-breaking-changes.sh b/scripts/check-breaking-changes.sh
index 79fa3d01978..7ce7a28ea94 100755
--- a/scripts/check-breaking-changes.sh
+++ b/scripts/check-breaking-changes.sh
@@ -67,5 +67,9 @@ echo "message=$GITHUB_MESSAGE" >>"$GITHUB_OUTPUT"
 mkdir -p ./levitate
 echo "$GITHUB_LEVITATE_MARKDOWN" >./levitate/levitate.md
 
+if [[ "$IS_FORK" == "true" ]]; then
+  cat ./levitate/levitate.md
+fi
+
 # We will exit the workflow accordingly at another step
 exit 0
diff --git a/scripts/levitate-parse-json-report.js b/scripts/levitate-parse-json-report.js
index 3bc62697de0..5cf92259910 100644
--- a/scripts/levitate-parse-json-report.js
+++ b/scripts/levitate-parse-json-report.js
@@ -4,6 +4,8 @@ const printAffectedPluginsSection = require('./levitate-show-affected-plugins');
 
 const data = JSON.parse(fs.readFileSync('data.json', 'utf8'));
 
+const isFork = Boolean(process.env.IS_FORK || false);
+
 function stripAnsi(str) {
   return str.replace(/\x1b\[[0-9;]*m/g, '');
 }
@@ -30,7 +32,8 @@ if (data.changes.length > 0) {
   markdown += printSection('Changes', data.changes);
 }
 
-if (data.removals.length > 0 || data.changes.length > 0) {
+// The logic below would need access to secrets for accessing BigQuery, however that's not available on forks.
+if ((data.removals.length > 0 || data.changes.length > 0) && !isFork) {
   markdown += printAffectedPluginsSection(data);
 }
 

From 35bf093201d994c5cd67f361fc4bc78e210e676b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 8 Jul 2025 12:56:49 +0000
Subject: [PATCH 17/21] Update dependency @types/systemjs to v6.15.3 (#107774)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json                                   |  2 +-
 packages/grafana-data/package.json             |  2 +-
 packages/grafana-o11y-ds-frontend/package.json |  2 +-
 packages/grafana-runtime/package.json          |  2 +-
 packages/grafana-sql/package.json              |  2 +-
 yarn.lock                                      | 18 +++++++++---------
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index bea7c19919d..c9d80186f8f 100644
--- a/package.json
+++ b/package.json
@@ -156,7 +156,7 @@
     "@types/slate-plain-serializer": "0.7.5",
     "@types/slate-react": "0.22.9",
     "@types/swagger-ui-react": "5.18.0",
-    "@types/systemjs": "6.15.1",
+    "@types/systemjs": "6.15.3",
     "@types/tinycolor2": "1.4.6",
     "@types/uuid": "10.0.0",
     "@types/webpack-assets-manifest": "^5",
diff --git a/packages/grafana-data/package.json b/packages/grafana-data/package.json
index 256f64527d1..aa2da7aef48 100644
--- a/packages/grafana-data/package.json
+++ b/packages/grafana-data/package.json
@@ -60,7 +60,7 @@
     "@leeoniya/ufuzzy": "1.0.18",
     "@types/d3-interpolate": "^3.0.0",
     "@types/string-hash": "1.1.3",
-    "@types/systemjs": "6.15.1",
+    "@types/systemjs": "6.15.3",
     "d3-interpolate": "3.0.1",
     "date-fns": "4.1.0",
     "dompurify": "3.2.6",
diff --git a/packages/grafana-o11y-ds-frontend/package.json b/packages/grafana-o11y-ds-frontend/package.json
index f69200d39e5..cf7da96e1c8 100644
--- a/packages/grafana-o11y-ds-frontend/package.json
+++ b/packages/grafana-o11y-ds-frontend/package.json
@@ -38,7 +38,7 @@
     "@types/jest": "^29.5.4",
     "@types/node": "22.15.0",
     "@types/react": "18.3.18",
-    "@types/systemjs": "6.15.1",
+    "@types/systemjs": "6.15.3",
     "jest": "^29.6.4",
     "react": "18.3.1",
     "ts-jest": "29.2.5",
diff --git a/packages/grafana-runtime/package.json b/packages/grafana-runtime/package.json
index 9e557b8e824..7eab5671779 100644
--- a/packages/grafana-runtime/package.json
+++ b/packages/grafana-runtime/package.json
@@ -58,7 +58,7 @@
     "@grafana/faro-web-sdk": "^1.13.2",
     "@grafana/schema": "12.1.0-pre",
     "@grafana/ui": "12.1.0-pre",
-    "@types/systemjs": "6.15.1",
+    "@types/systemjs": "6.15.3",
     "history": "4.10.1",
     "lodash": "4.17.21",
     "react-loading-skeleton": "3.5.0",
diff --git a/packages/grafana-sql/package.json b/packages/grafana-sql/package.json
index aa600c07f6a..303af8c1f7a 100644
--- a/packages/grafana-sql/package.json
+++ b/packages/grafana-sql/package.json
@@ -47,7 +47,7 @@
     "@types/react": "18.3.18",
     "@types/react-dom": "18.3.5",
     "@types/react-virtualized-auto-sizer": "1.0.4",
-    "@types/systemjs": "6.15.1",
+    "@types/systemjs": "6.15.3",
     "@types/uuid": "10.0.0",
     "i18next-parser": "9.3.0",
     "jest": "^29.6.4",
diff --git a/yarn.lock b/yarn.lock
index 75841a2897f..833ddf85155 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3073,7 +3073,7 @@ __metadata:
     "@types/react": "npm:18.3.18"
     "@types/react-dom": "npm:18.3.5"
     "@types/string-hash": "npm:1.1.3"
-    "@types/systemjs": "npm:6.15.1"
+    "@types/systemjs": "npm:6.15.3"
     "@types/tinycolor2": "npm:1.4.6"
     d3-interpolate: "npm:3.0.1"
     date-fns: "npm:4.1.0"
@@ -3346,7 +3346,7 @@ __metadata:
     "@types/jest": "npm:^29.5.4"
     "@types/node": "npm:22.15.0"
     "@types/react": "npm:18.3.18"
-    "@types/systemjs": "npm:6.15.1"
+    "@types/systemjs": "npm:6.15.3"
     jest: "npm:^29.6.4"
     react: "npm:18.3.1"
     react-select: "npm:5.10.1"
@@ -3520,7 +3520,7 @@ __metadata:
     "@types/lodash": "npm:4.17.20"
     "@types/react": "npm:18.3.18"
     "@types/react-dom": "npm:18.3.5"
-    "@types/systemjs": "npm:6.15.1"
+    "@types/systemjs": "npm:6.15.3"
     esbuild: "npm:0.25.0"
     history: "npm:4.10.1"
     lodash: "npm:4.17.21"
@@ -3628,7 +3628,7 @@ __metadata:
     "@types/react": "npm:18.3.18"
     "@types/react-dom": "npm:18.3.5"
     "@types/react-virtualized-auto-sizer": "npm:1.0.4"
-    "@types/systemjs": "npm:6.15.1"
+    "@types/systemjs": "npm:6.15.3"
     "@types/uuid": "npm:10.0.0"
     i18next-parser: "npm:9.3.0"
     immutable: "npm:5.1.3"
@@ -10159,10 +10159,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/systemjs@npm:6.15.1":
-  version: 6.15.1
-  resolution: "@types/systemjs@npm:6.15.1"
-  checksum: 10/4c29f4951299b67a287b8b21219416c4d8eee277582ae045f6a97eaaa9d27ad59789f6b608c5519adf0e42eee23f139c4027cc157f37807a16b4601b353f5442
+"@types/systemjs@npm:6.15.3":
+  version: 6.15.3
+  resolution: "@types/systemjs@npm:6.15.3"
+  checksum: 10/c2e6d7b3d83282657074e0b2d5bfcd6e4923f02d659e7bd3bca215466aee1960a444243d0f97dd26e8843a45e2b34ee33ecac39efb4e419ce2dc8f8f7fb03472
   languageName: node
   linkType: hard
 
@@ -18223,7 +18223,7 @@ __metadata:
     "@types/slate-plain-serializer": "npm:0.7.5"
     "@types/slate-react": "npm:0.22.9"
     "@types/swagger-ui-react": "npm:5.18.0"
-    "@types/systemjs": "npm:6.15.1"
+    "@types/systemjs": "npm:6.15.3"
     "@types/tinycolor2": "npm:1.4.6"
     "@types/uuid": "npm:10.0.0"
     "@types/webpack-assets-manifest": "npm:^5"

From 047349638dd151d54c753742915fd33fd6dd85e2 Mon Sep 17 00:00:00 2001
From: Kevin Minehart <5140827+kminehart@users.noreply.github.com>
Date: Tue, 8 Jul 2025 07:58:45 -0500
Subject: [PATCH 18/21] CI: Run `lerna bump version` before `yarn build`
 (#107731)

lerna bump version before yarn build

Co-authored-by: Jack Westbrook <jack.westbrook@gmail.com>
---
 pkg/build/daggerbuild/artifacts/frontend.go      | 2 +-
 pkg/build/daggerbuild/artifacts/package_targz.go | 2 +-
 pkg/build/daggerbuild/frontend/build.go          | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkg/build/daggerbuild/artifacts/frontend.go b/pkg/build/daggerbuild/artifacts/frontend.go
index 403c515b4e4..298f990a642 100644
--- a/pkg/build/daggerbuild/artifacts/frontend.go
+++ b/pkg/build/daggerbuild/artifacts/frontend.go
@@ -47,7 +47,7 @@ func (f *Frontend) BuildFile(ctx context.Context, builder *dagger.Container, opt
 }
 
 func (f *Frontend) BuildDir(ctx context.Context, builder *dagger.Container, opts *pipeline.ArtifactContainerOpts) (*dagger.Directory, error) {
-	return frontend.Build(builder), nil
+	return frontend.Build(builder, f.Version), nil
 }
 
 func (f *Frontend) Publisher(ctx context.Context, opts *pipeline.ArtifactContainerOpts) (*dagger.Container, error) {
diff --git a/pkg/build/daggerbuild/artifacts/package_targz.go b/pkg/build/daggerbuild/artifacts/package_targz.go
index 5e35c553042..93e09112ceb 100644
--- a/pkg/build/daggerbuild/artifacts/package_targz.go
+++ b/pkg/build/daggerbuild/artifacts/package_targz.go
@@ -164,7 +164,7 @@ func NewTarball(
 	if err != nil {
 		return nil, err
 	}
-	frontendArtifact, err := NewFrontend(ctx, log, version, artifact, enterprise, src, cache)
+	frontendArtifact, err := NewFrontend(ctx, log, artifact, version, enterprise, src, cache)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/build/daggerbuild/frontend/build.go b/pkg/build/daggerbuild/frontend/build.go
index b04cdc01767..9aec71e37d9 100644
--- a/pkg/build/daggerbuild/frontend/build.go
+++ b/pkg/build/daggerbuild/frontend/build.go
@@ -1,11 +1,14 @@
 package frontend
 
 import (
+	"fmt"
+
 	"dagger.io/dagger"
 )
 
-func Build(builder *dagger.Container) *dagger.Directory {
+func Build(builder *dagger.Container, version string) *dagger.Directory {
 	public := builder.
+		WithExec([]string{"/bin/sh", "-c", fmt.Sprintf("yarn lerna version %s --exact --no-git-tag-version --no-push --force-publish -y", version)}).
 		WithExec([]string{"yarn", "run", "build"}).
 		WithExec([]string{"/bin/sh", "-c", "find /src/public -type d -name node_modules -print0 | xargs -0 rm -rf"}).
 		Directory("/src/public")

From e33047bdf1893ee10499b05d2e84d5d01f31541b Mon Sep 17 00:00:00 2001
From: Alexa Vargas <239999+axelavargas@users.noreply.github.com>
Date: Tue, 8 Jul 2025 15:07:22 +0200
Subject: [PATCH 19/21] Dashboard: Library Panels - Add ability to search by
 folder name (#106997)

* Dashboard: Add ability to search by folder name in library panels

* restore to main to fix linting issues

* restore from main to avoid go linting issues

* add logic to the writers.go that search by folder title if folder is not passed

* add missing left joing from the folder table

* Add extra logic to prevent folder searches without permission

* fix go linting issue about memory

* Add test when searching by folder name

* Refactor tests to include a bit more validation

* apply feedback and use SearchFolder from search folder service

* clean up comments

* Update pkg/services/libraryelements/database.go

Co-authored-by: Ezequiel Victorero <ezequiel.victorero@grafana.com>

* Fix logic of early return

* Extract into a function and remove the left join

* Apply feedback to be aligned with idiomatic go

* Apply suggestion from @evictorero

Co-authored-by: Ezequiel Victorero <ezequiel.victorero@grafana.com>

* fix liting

---------

Co-authored-by: Ezequiel Victorero <ezequiel.victorero@grafana.com>
---
 pkg/services/libraryelements/database.go      |  55 +++++-
 .../libraryelements_get_all_test.go           | 179 ++++++++++++++++++
 pkg/services/libraryelements/writers.go       |  19 +-
 .../LibraryPanelsSearch.tsx                   |   2 +-
 public/locales/en-US/grafana.json             |   2 +-
 5 files changed, 249 insertions(+), 8 deletions(-)

diff --git a/pkg/services/libraryelements/database.go b/pkg/services/libraryelements/database.go
index ea91df4fe79..96c5f82cd22 100644
--- a/pkg/services/libraryelements/database.go
+++ b/pkg/services/libraryelements/database.go
@@ -426,6 +426,11 @@ func (l *LibraryElementService) getAllLibraryElements(c context.Context, signedI
 	if folderFilter.parseError != nil {
 		return model.LibraryElementSearchResult{}, folderFilter.parseError
 	}
+
+	foldersWithMatchingTitles, err := getFoldersWithMatchingTitles(c, l, signedInUser, query)
+	if err != nil {
+		return model.LibraryElementSearchResult{}, err
+	}
 	err = l.SQLStore.WithDbSession(c, func(session *db.Session) error {
 		builder := db.NewSqlBuilder(l.Cfg, l.features, l.SQLStore.GetDialect(), recursiveQueriesAreSupported)
 		if folderFilter.includeGeneralFolder {
@@ -434,7 +439,7 @@ func (l *LibraryElementService) getAllLibraryElements(c context.Context, signedI
 			builder.Write(getFromLibraryElementDTOWithMeta(l.SQLStore.GetDialect()))
 			builder.Write(` WHERE le.org_id=?  AND le.folder_id=0`, signedInUser.GetOrgID())
 			writeKindSQL(query, &builder)
-			writeSearchStringSQL(query, l.SQLStore, &builder)
+			writeSearchStringSQL(query, l.SQLStore, &builder, foldersWithMatchingTitles)
 			writeExcludeSQL(query, &builder)
 			writeTypeFilterSQL(typeFilter, &builder)
 			builder.Write(" ")
@@ -446,7 +451,7 @@ func (l *LibraryElementService) getAllLibraryElements(c context.Context, signedI
 		builder.Write(getFromLibraryElementDTOWithMeta(l.SQLStore.GetDialect()))
 		builder.Write(` WHERE le.org_id=? AND le.folder_id<>0`, signedInUser.GetOrgID())
 		writeKindSQL(query, &builder)
-		writeSearchStringSQL(query, l.SQLStore, &builder)
+		writeSearchStringSQL(query, l.SQLStore, &builder, foldersWithMatchingTitles)
 		writeExcludeSQL(query, &builder)
 		writeTypeFilterSQL(typeFilter, &builder)
 		if err := folderFilter.writeFolderFilterSQL(false, &builder); err != nil {
@@ -525,7 +530,7 @@ func (l *LibraryElementService) getAllLibraryElements(c context.Context, signedI
 			countBuilder.Write(getFromLibraryElementDTOWithMeta(l.SQLStore.GetDialect()))
 			countBuilder.Write(` WHERE le.org_id=? AND le.folder_id=0`, signedInUser.GetOrgID())
 			writeKindSQL(query, &countBuilder)
-			writeSearchStringSQL(query, l.SQLStore, &countBuilder)
+			writeSearchStringSQL(query, l.SQLStore, &countBuilder, foldersWithMatchingTitles)
 			writeExcludeSQL(query, &countBuilder)
 			writeTypeFilterSQL(typeFilter, &countBuilder)
 			countBuilder.Write(" ")
@@ -536,7 +541,7 @@ func (l *LibraryElementService) getAllLibraryElements(c context.Context, signedI
 		countBuilder.Write(getFromLibraryElementDTOWithMeta(l.SQLStore.GetDialect()))
 		countBuilder.Write(` WHERE le.org_id=? AND le.folder_id<>0`, signedInUser.GetOrgID())
 		writeKindSQL(query, &countBuilder)
-		writeSearchStringSQL(query, l.SQLStore, &countBuilder)
+		writeSearchStringSQL(query, l.SQLStore, &countBuilder, foldersWithMatchingTitles)
 		writeExcludeSQL(query, &countBuilder)
 		writeTypeFilterSQL(typeFilter, &countBuilder)
 		if err := folderFilter.writeFolderFilterSQL(true, &countBuilder); err != nil {
@@ -882,3 +887,45 @@ func contains(slice []string, element string) bool {
 	}
 	return false
 }
+
+func getFoldersWithMatchingTitles(c context.Context, l *LibraryElementService, signedInUser identity.Requester, query model.SearchLibraryElementsQuery) ([]string, error) {
+	if len(strings.TrimSpace(query.SearchString)) <= 0 {
+		return nil, nil
+	}
+
+	if l.features.IsEnabled(c, featuremgmt.FlagKubernetesClientDashboardsFolders) {
+		searchQuery := folder.SearchFoldersQuery{
+			OrgID:        signedInUser.GetOrgID(),
+			Title:        query.SearchString,
+			SignedInUser: signedInUser,
+		}
+
+		folderHits, err := l.folderService.SearchFolders(c, searchQuery)
+		if err != nil {
+			return nil, err
+		}
+
+		foldersWithMatchingTitles := make([]string, 0, len(folderHits))
+		for _, hit := range folderHits {
+			foldersWithMatchingTitles = append(foldersWithMatchingTitles, hit.UID)
+		}
+		return foldersWithMatchingTitles, nil
+	}
+
+	// Fallback to GetFolders
+	fs, err := l.folderService.GetFolders(c, folder.GetFoldersQuery{
+		OrgID:        signedInUser.GetOrgID(),
+		SignedInUser: signedInUser,
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	foldersWithMatchingTitles := make([]string, 0, len(fs))
+	for _, f := range fs {
+		if strings.Contains(strings.ToLower(f.Title), strings.ToLower(query.SearchString)) {
+			foldersWithMatchingTitles = append(foldersWithMatchingTitles, f.UID)
+		}
+	}
+	return foldersWithMatchingTitles, nil
+}
diff --git a/pkg/services/libraryelements/libraryelements_get_all_test.go b/pkg/services/libraryelements/libraryelements_get_all_test.go
index 3c61d08b8ab..970730399c9 100644
--- a/pkg/services/libraryelements/libraryelements_get_all_test.go
+++ b/pkg/services/libraryelements/libraryelements_get_all_test.go
@@ -1164,4 +1164,183 @@ func TestIntegration_GetAllLibraryElements(t *testing.T) {
 				t.Fatalf("Result mismatch (-want +got):\n%s", diff)
 			}
 		})
+
+	// Folder name search integration tests
+	scenarioWithPanel(t, "When searching by folder name, it should return panels in that folder",
+		func(t *testing.T, sc scenarioContext) {
+			// Create a panel in the existing folder
+			// nolint:staticcheck
+			command := getCreatePanelCommand(sc.folder.ID, sc.folder.UID, "Panel in ScenarioFolder")
+			sc.reqContext.Req.Body = mockRequestBody(command)
+			resp := sc.service.createHandler(sc.reqContext)
+			require.Equal(t, 200, resp.Status())
+
+			// Search by folder name
+			err := sc.reqContext.Req.ParseForm()
+			require.NoError(t, err)
+			sc.reqContext.Req.Form.Add("searchString", "ScenarioFolder")
+			resp = sc.service.getAllHandler(sc.reqContext)
+			require.Equal(t, 200, resp.Status())
+
+			var result libraryElementsSearch
+			err = json.Unmarshal(resp.Body(), &result)
+			require.NoError(t, err)
+
+			// Verify folder search finds both panels
+			require.Equal(t, int64(2), result.Result.TotalCount)
+			require.Equal(t, 2, len(result.Result.Elements))
+			require.Equal(t, 1, result.Result.Page)
+			require.Equal(t, 100, result.Result.PerPage)
+			for _, element := range result.Result.Elements {
+				require.Equal(t, int64(1), element.OrgID, "Should be in org 1")
+				require.Equal(t, sc.folder.UID, element.FolderUID, "Should have correct folder UID")
+				require.Equal(t, "ScenarioFolder", element.Meta.FolderName, "All panels should be in ScenarioFolder")
+				require.Equal(t, int64(model.PanelElement), element.Kind, "Should be a panel element")
+				require.Equal(t, "text", element.Type, "Should be text panel")
+				require.NotEmpty(t, element.UID, "Should have a UID")
+				require.NotEmpty(t, element.Name, "Should have a name")
+				require.Equal(t, int64(0), element.Meta.ConnectedDashboards, "Should have no connected dashboards")
+			}
+		})
+
+	scenarioWithPanel(t, "When searching by folder name that doesn't exist, it should return no results",
+		func(t *testing.T, sc scenarioContext) {
+			// Search by non-existent folder name
+			err := sc.reqContext.Req.ParseForm()
+			require.NoError(t, err)
+			sc.reqContext.Req.Form.Add("searchString", "NonExistentFolder")
+			resp := sc.service.getAllHandler(sc.reqContext)
+			require.Equal(t, 200, resp.Status())
+
+			var result libraryElementsSearch
+			err = json.Unmarshal(resp.Body(), &result)
+			require.NoError(t, err)
+
+			// Verify no results for non-existent folder
+			expected := libraryElementsSearch{
+				Result: libraryElementsSearchResult{
+					TotalCount: 0,
+					Elements:   []libraryElement{},
+					Page:       1,
+					PerPage:    100,
+				},
+			}
+			if diff := cmp.Diff(expected, result, getCompareOptions()...); diff != "" {
+				t.Fatalf("Result mismatch (-want +got):\n%s", diff)
+			}
+			require.Equal(t, 0, len(result.Result.Elements), "Should return empty elements array")
+		})
+
+	scenarioWithPanel(t, "When searching with folder filter applied, folder name search should be disabled",
+		func(t *testing.T, sc scenarioContext) {
+			// Create a panel in the existing folder
+			// nolint:staticcheck
+			command := getCreatePanelCommand(sc.folder.ID, sc.folder.UID, "Panel for folder filter test")
+			sc.reqContext.Req.Body = mockRequestBody(command)
+			resp := sc.service.createHandler(sc.reqContext)
+			require.Equal(t, 200, resp.Status())
+
+			// Search with both searchString and folderFilterUIDs
+			// This should NOT search folder names, only panel names/descriptions within the specified folder
+			err := sc.reqContext.Req.ParseForm()
+			require.NoError(t, err)
+			sc.reqContext.Req.Form.Add("searchString", "ScenarioFolder")
+			sc.reqContext.Req.Form.Add("folderFilterUIDs", sc.folder.UID)
+			resp = sc.service.getAllHandler(sc.reqContext)
+			require.Equal(t, 200, resp.Status())
+
+			var result libraryElementsSearch
+			err = json.Unmarshal(resp.Body(), &result)
+			require.NoError(t, err)
+
+			// Folder name search disabled when folder filter applied
+			expected := libraryElementsSearch{
+				Result: libraryElementsSearchResult{
+					TotalCount: 0,
+					Elements:   []libraryElement{},
+					Page:       1,
+					PerPage:    100,
+				},
+			}
+			if diff := cmp.Diff(expected, result, getCompareOptions()...); diff != "" {
+				t.Fatalf("Result mismatch (-want +got):\n%s", diff)
+			}
+
+			require.Equal(t, int64(0), result.Result.TotalCount, "Should not find panels by folder name when folder filter is applied")
+			require.Equal(t, 0, len(result.Result.Elements), "Should return empty elements array")
+		})
+
+	scenarioWithPanel(t, "When searching by partial folder name, it should return panels in matching folders",
+		func(t *testing.T, sc scenarioContext) {
+			// Create a panel in the existing folder
+			// nolint:staticcheck
+			command := getCreatePanelCommand(sc.folder.ID, sc.folder.UID, "Test Panel")
+			sc.reqContext.Req.Body = mockRequestBody(command)
+			resp := sc.service.createHandler(sc.reqContext)
+			require.Equal(t, 200, resp.Status())
+
+			// Search by partial folder name
+			err := sc.reqContext.Req.ParseForm()
+			require.NoError(t, err)
+			sc.reqContext.Req.Form.Add("searchString", "Scenario")
+			resp = sc.service.getAllHandler(sc.reqContext)
+			require.Equal(t, 200, resp.Status())
+
+			var result libraryElementsSearch
+			err = json.Unmarshal(resp.Body(), &result)
+			require.NoError(t, err)
+
+			// Verify partial folder name matching
+			require.Equal(t, int64(2), result.Result.TotalCount, "Should find exactly 2 panels by partial folder name")
+			require.Equal(t, 2, len(result.Result.Elements), "Should return 2 elements")
+			require.Equal(t, 1, result.Result.Page, "Should be on page 1")
+			require.Equal(t, 100, result.Result.PerPage, "Should have perPage 100")
+
+			for _, element := range result.Result.Elements {
+				require.Equal(t, int64(1), element.OrgID, "Should be in org 1")
+				require.Equal(t, sc.folder.UID, element.FolderUID, "Should have correct folder UID")
+				require.Contains(t, element.Meta.FolderName, "Scenario", "Folder name should contain 'Scenario'")
+				require.Equal(t, "ScenarioFolder", element.Meta.FolderName, "Should be in ScenarioFolder")
+				require.Equal(t, int64(model.PanelElement), element.Kind, "Should be a panel element")
+				require.NotEmpty(t, element.UID, "Should have a UID")
+				require.NotEmpty(t, element.Name, "Should have a name")
+			}
+		})
+
+	scenarioWithPanel(t, "When searching combines panel name and folder name matches, it should return both",
+		func(t *testing.T, sc scenarioContext) {
+			// Create a panel with a specific name
+			// nolint:staticcheck
+			command := getCreatePanelCommand(sc.folder.ID, sc.folder.UID, "Marketing Report Panel")
+			sc.reqContext.Req.Body = mockRequestBody(command)
+			resp := sc.service.createHandler(sc.reqContext)
+			require.Equal(t, 200, resp.Status())
+
+			// Search for "Marketing" which could match both panel name and folder name
+			err := sc.reqContext.Req.ParseForm()
+			require.NoError(t, err)
+			sc.reqContext.Req.Form.Add("searchString", "Marketing")
+			resp = sc.service.getAllHandler(sc.reqContext)
+			require.Equal(t, 200, resp.Status())
+
+			var result libraryElementsSearch
+			err = json.Unmarshal(resp.Body(), &result)
+			require.NoError(t, err)
+
+			// Verify panel name matching
+			require.Equal(t, int64(1), result.Result.TotalCount, "Should find exactly 1 panel with 'Marketing' in name")
+			require.Equal(t, 1, len(result.Result.Elements), "Should return 1 element")
+			require.Equal(t, 1, result.Result.Page, "Should be on page 1")
+			require.Equal(t, 100, result.Result.PerPage, "Should have perPage 100")
+
+			element := result.Result.Elements[0]
+			require.Equal(t, "Marketing Report Panel", element.Name, "Should find panel with correct name")
+			require.Equal(t, int64(1), element.OrgID, "Should be in org 1")
+			require.Equal(t, sc.folder.UID, element.FolderUID, "Should have correct folder UID")
+			require.Equal(t, "ScenarioFolder", element.Meta.FolderName, "Should be in ScenarioFolder")
+			require.Equal(t, int64(model.PanelElement), element.Kind, "Should be a panel element")
+			require.Equal(t, "text", element.Type, "Should be text panel")
+			require.NotEmpty(t, element.UID, "Should have a UID")
+			require.Equal(t, int64(0), element.Meta.ConnectedDashboards, "Should have no connected dashboards")
+		})
 }
diff --git a/pkg/services/libraryelements/writers.go b/pkg/services/libraryelements/writers.go
index c35dedcd737..39bfadbb312 100644
--- a/pkg/services/libraryelements/writers.go
+++ b/pkg/services/libraryelements/writers.go
@@ -58,13 +58,28 @@ func writeTypeFilterSQL(typeFilter []string, builder *db.SQLBuilder) {
 	}
 }
 
-func writeSearchStringSQL(query model.SearchLibraryElementsQuery, sqlStore db.DB, builder *db.SQLBuilder) {
+func writeSearchStringSQL(query model.SearchLibraryElementsQuery, sqlStore db.DB, builder *db.SQLBuilder, foldersWithMatchingTitles []string) {
 	if len(strings.TrimSpace(query.SearchString)) > 0 {
+		// Search element names across all accessible folders
 		sql, param := sqlStore.GetDialect().LikeOperator("le.name", true, query.SearchString, true)
 		builder.Write(" AND ("+sql, param)
 
+		// Search element descriptions across all accessible folders
 		sql, param = sqlStore.GetDialect().LikeOperator("le.description", true, query.SearchString, true)
-		builder.Write(" OR "+sql+")", param)
+		builder.Write(" OR "+sql, param)
+
+		// Include ALL elements from folders whose titles match the search string
+		hasFolderFilter := len(strings.TrimSpace(query.FolderFilterUIDs)) > 0
+		if !hasFolderFilter && len(foldersWithMatchingTitles) > 0 {
+			folderUIDsSQL := "?" + strings.Repeat(",?", len(foldersWithMatchingTitles)-1)
+			params := make([]any, 0, len(foldersWithMatchingTitles))
+			for _, folderUID := range foldersWithMatchingTitles {
+				params = append(params, folderUID)
+			}
+			builder.Write(" OR le.folder_uid IN ("+folderUIDsSQL+")", params...)
+		}
+
+		builder.Write(")")
 	}
 }
 
diff --git a/public/app/features/library-panels/components/LibraryPanelsSearch/LibraryPanelsSearch.tsx b/public/app/features/library-panels/components/LibraryPanelsSearch/LibraryPanelsSearch.tsx
index d4588f0ccff..9c6ca73c898 100644
--- a/public/app/features/library-panels/components/LibraryPanelsSearch/LibraryPanelsSearch.tsx
+++ b/public/app/features/library-panels/components/LibraryPanelsSearch/LibraryPanelsSearch.tsx
@@ -69,7 +69,7 @@ export const LibraryPanelsSearch = ({
               onChange={setSearchQuery}
               placeholder={t(
                 'library-panels.library-panels-search.placeholder-search-by-name-or-description',
-                'Search by name or description'
+                'Search by name, description or folder name'
               )}
               width={0}
               escapeRegex={false}
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index 4334abe4952..4f517a706ed 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -8495,7 +8495,7 @@
       "usage-count_other": "Used on {{count}} dashboards"
     },
     "library-panels-search": {
-      "placeholder-search-by-name-or-description": "Search by name or description"
+      "placeholder-search-by-name-or-description": "Search by name, description or folder name"
     },
     "loading-indicator": {
       "loading-library-panel": "Loading library panel..."

From 2e3c2df6bf677bde44017112809089aa4284e513 Mon Sep 17 00:00:00 2001
From: Alexa Vargas <239999+axelavargas@users.noreply.github.com>
Date: Tue, 8 Jul 2025 15:08:01 +0200
Subject: [PATCH 20/21] Dashboard: Add Alert icon in library panels (#107723)

* Use panel.id from the dashboard to filter alterts properly

* add unit test

* Fix linting

* add fix back

* fix betterer in test, use same pattern as DashboardDatasourceBehaviour
---
 .../scene/LibraryPanelBehavior.test.tsx       | 28 ++++++++++++++++++-
 .../scene/LibraryPanelBehavior.tsx            |  5 ++++
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/public/app/features/dashboard-scene/scene/LibraryPanelBehavior.test.tsx b/public/app/features/dashboard-scene/scene/LibraryPanelBehavior.test.tsx
index 62a4cc2d77f..e8a3c3d4d8b 100644
--- a/public/app/features/dashboard-scene/scene/LibraryPanelBehavior.test.tsx
+++ b/public/app/features/dashboard-scene/scene/LibraryPanelBehavior.test.tsx
@@ -3,13 +3,21 @@ import { of } from 'rxjs';
 import { FieldType, LoadingState, PanelData, getDefaultTimeRange, toDataFrame } from '@grafana/data';
 import { getPanelPlugin } from '@grafana/data/test';
 import { config, setPluginImportUtils, setRunRequest } from '@grafana/runtime';
-import { SceneCanvasText, sceneGraph, SceneGridLayout, VizPanel } from '@grafana/scenes';
+import {
+  SceneCanvasText,
+  SceneDataTransformer,
+  sceneGraph,
+  SceneGridLayout,
+  SceneQueryRunner,
+  VizPanel,
+} from '@grafana/scenes';
 import { LibraryPanel } from '@grafana/schema';
 import * as libpanels from 'app/features/library-panels/state/api';
 
 import { vizPanelToPanel } from '../serialization/transformSceneToSaveModel';
 import { NEW_LINK } from '../settings/links/utils';
 import { activateFullSceneTree } from '../utils/test-utils';
+import { getPanelIdForVizPanel } from '../utils/utils';
 
 import { DashboardScene } from './DashboardScene';
 import { LibraryPanelBehavior } from './LibraryPanelBehavior';
@@ -179,6 +187,24 @@ describe('LibraryPanelBehavior', () => {
     expect(behaviorClone.state._loadedPanel?.name).toBe('LibraryPanel A');
     expect(behaviorClone.state._loadedPanel?.uid).toBe('111');
   });
+
+  it('should use dashboard panel ID for data provider filtering', async () => {
+    const { gridItem } = await buildTestSceneWithLibraryPanel();
+
+    const vizPanel = gridItem.state.body;
+
+    // Get the dashboard panel ID from the VizPanel key
+    const dashboardPanelId = getPanelIdForVizPanel(vizPanel);
+    expect(dashboardPanelId).toBe(1); // Based on key 'panel-1'
+
+    // Verify the data provider uses the dashboard panel ID for filtering
+    const dataProvider = vizPanel.state.$data as SceneDataTransformer;
+    expect(dataProvider).toBeDefined();
+
+    // Access the SceneQueryRunner through the SceneDataTransformer
+    const queryRunner = dataProvider.state?.$data as SceneQueryRunner;
+    expect(queryRunner?.state?.dataLayerFilter?.panelId).toBe(dashboardPanelId);
+  });
 });
 
 async function buildTestSceneWithLibraryPanel() {
diff --git a/public/app/features/dashboard-scene/scene/LibraryPanelBehavior.tsx b/public/app/features/dashboard-scene/scene/LibraryPanelBehavior.tsx
index c42d1f1b423..ecccc4b21d1 100644
--- a/public/app/features/dashboard-scene/scene/LibraryPanelBehavior.tsx
+++ b/public/app/features/dashboard-scene/scene/LibraryPanelBehavior.tsx
@@ -8,6 +8,7 @@ import { PanelModel } from 'app/features/dashboard/state/PanelModel';
 import { getLibraryPanel } from 'app/features/library-panels/state/api';
 
 import { createPanelDataProvider } from '../utils/createPanelDataProvider';
+import { getPanelIdForVizPanel } from '../utils/utils';
 
 import { VizPanelLinks, VizPanelLinksMenu } from './PanelLinks';
 import { panelLinksBehavior } from './PanelMenuBehavior';
@@ -50,6 +51,10 @@ export class LibraryPanelBehavior extends SceneObjectBase<LibraryPanelBehaviorSt
 
     const libPanelModel = new PanelModel(libPanel.model);
 
+    // Use dashboard panel ID for data layer filtering
+    const dashboardPanelId = getPanelIdForVizPanel(vizPanel);
+    libPanelModel.id = dashboardPanelId;
+
     const titleItems: SceneObject[] = [];
 
     titleItems.push(

From 15967cb7abdc8fa644578e2559ac40def78fa451 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 8 Jul 2025 14:26:25 +0100
Subject: [PATCH 21/21] Update dependency @types/webpack-env to v1.18.8
 (#107777)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 833ddf85155..4039baa5714 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10263,9 +10263,9 @@ __metadata:
   linkType: hard
 
 "@types/webpack-env@npm:^1.18.4":
-  version: 1.18.5
-  resolution: "@types/webpack-env@npm:1.18.5"
-  checksum: 10/3c8dd0b23d45e2d33abdfbae7f1d8f75ce23d54588b08943e833f4dba81eb683ac68672a75eccbdba8e008bc1647638803c1bcadc8cdfd1dd7142fa2c3f612de
+  version: 1.18.8
+  resolution: "@types/webpack-env@npm:1.18.8"
+  checksum: 10/f3932f3d6c2530f644cfc898eda1ab8182d6ae57f555c2f0179d813549b639078671b71e4041831fc306c5ebe61f5cdac794fe4ceae281fce8bf67e23661a488
   languageName: node
   linkType: hard