diff --git a/ui-ngx/src/app/modules/home/components/import-export/import-export.service.ts b/ui-ngx/src/app/modules/home/components/import-export/import-export.service.ts
index e91375e75e..f279972101 100644
--- a/ui-ngx/src/app/modules/home/components/import-export/import-export.service.ts
+++ b/ui-ngx/src/app/modules/home/components/import-export/import-export.service.ts
@@ -298,13 +298,13 @@ export class ImportExportService {
   }
 
   public importWidgetType(): Observable<WidgetType> {
-    return this.openImportDialog('widget-type.import', 'widget-type.widget-type-file').pipe(
+    return this.openImportDialog('widget.import', 'widget-type.widget-file').pipe(
       mergeMap((widgetTypeDetails: WidgetTypeDetails) => {
         if (!this.validateImportedWidgetTypeDetails(widgetTypeDetails)) {
           this.store.dispatch(new ActionNotificationShow(
-            {message: this.translate.instant('widget-type.invalid-widget-type-file-error'),
+            {message: this.translate.instant('widget-type.invalid-widget-file-error'),
               type: 'error'}));
-          throw new Error('Invalid widget type file');
+          throw new Error('Invalid widget file');
         } else {
           return this.widgetService.saveImportedWidgetTypeDetails(widgetTypeDetails);
         }
diff --git a/ui-ngx/src/app/modules/home/pages/widget/save-widget-type-as-dialog.component.html b/ui-ngx/src/app/modules/home/pages/widget/save-widget-type-as-dialog.component.html
index 2ce7acd7e1..7588d1d8f5 100644
--- a/ui-ngx/src/app/modules/home/pages/widget/save-widget-type-as-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/pages/widget/save-widget-type-as-dialog.component.html
@@ -17,7 +17,7 @@
 -->
 <form [formGroup]="saveWidgetTypeAsFormGroup" (ngSubmit)="saveAs()">
   <mat-toolbar color="primary">
-    <h2 translate>widget.save-widget-type-as</h2>
+    <h2 translate>widget.save-widget-as</h2>
     <span fxFlex></span>
     <button mat-icon-button
             (click)="cancel()"
@@ -30,7 +30,7 @@
   <div style="height: 4px;" *ngIf="!(isLoading$ | async)"></div>
   <div mat-dialog-content>
     <fieldset>
-      <span translate>widget.save-widget-type-as-text</span>
+      <span translate>widget.save-widget-as-text</span>
       <mat-form-field class="mat-block">
         <mat-label translate>widget.title</mat-label>
         <input matInput formControlName="title" required>
diff --git a/ui-ngx/src/app/modules/home/pages/widget/widget-type.component.html b/ui-ngx/src/app/modules/home/pages/widget/widget-type.component.html
index 19309e8660..9db9780b70 100644
--- a/ui-ngx/src/app/modules/home/pages/widget/widget-type.component.html
+++ b/ui-ngx/src/app/modules/home/pages/widget/widget-type.component.html
@@ -20,19 +20,19 @@
           [disabled]="(isLoading$ | async)"
           (click)="onEntityAction($event, 'edit')"
           [fxShow]="!isEdit">
-    {{'widget.edit-widget-type' | translate }}
+    {{ 'widget.edit' | translate }}
   </button>
   <button mat-raised-button color="primary"
           [disabled]="(isLoading$ | async)"
           (click)="onEntityAction($event, 'export')"
           [fxShow]="!isEdit">
-    {{'widget-type.export' | translate }}
+    {{ 'widget.export' | translate }}
   </button>
   <button mat-raised-button color="primary"
           [disabled]="(isLoading$ | async)"
           (click)="onEntityAction($event, 'delete')"
           [fxShow]="!hideDelete() && !isEdit">
-    {{'widget.delete-widget-type' | translate }}
+    {{ 'widget.delete-widget' | translate }}
   </button>
 </div>
 <div class="mat-padding" fxLayout="column">
diff --git a/ui-ngx/src/app/modules/home/pages/widget/widget-types-table-config.resolver.ts b/ui-ngx/src/app/modules/home/pages/widget/widget-types-table-config.resolver.ts
index 8fcf76f1fe..0363aa6117 100644
--- a/ui-ngx/src/app/modules/home/pages/widget/widget-types-table-config.resolver.ts
+++ b/ui-ngx/src/app/modules/home/pages/widget/widget-types-table-config.resolver.ts
@@ -87,13 +87,13 @@ export class WidgetTypesTableConfigResolver implements Resolve<EntityTableConfig
 
     this.config.addActionDescriptors.push(
       {
-        name: this.translate.instant('widget-type.create-new-widget-type'),
+        name: this.translate.instant('dashboard.create-new-widget'),
         icon: 'insert_drive_file',
         isEnabled: () => true,
         onAction: ($event) => this.addWidgetType($event)
       },
       {
-        name: this.translate.instant('widget-type.import'),
+        name: this.translate.instant('widget.import'),
         icon: 'file_upload',
         isEnabled: () => true,
         onAction: ($event) => this.importWidgetType($event)
@@ -102,13 +102,13 @@ export class WidgetTypesTableConfigResolver implements Resolve<EntityTableConfig
 
     this.config.cellActionDescriptors.push(
       {
-        name: this.translate.instant('widget-type.export'),
+        name: this.translate.instant('widget.export'),
         icon: 'file_download',
         isEnabled: () => true,
         onAction: ($event, entity) => this.exportWidgetType($event, entity)
       },
       {
-        name: this.translate.instant('widget.widget-type-details'),
+        name: this.translate.instant('widget.widget-details'),
         icon: 'edit',
         isEnabled: () => true,
         onAction: ($event, entity) => this.config.toggleEntityDetails($event, entity)
@@ -117,18 +117,18 @@ export class WidgetTypesTableConfigResolver implements Resolve<EntityTableConfig
 
     this.config.groupActionDescriptors.push(
       {
-        name: this.translate.instant('widget-type.export-widget-types'),
+        name: this.translate.instant('widget.export-widgets'),
         icon: 'file_download',
         isEnabled: true,
         onAction: ($event, entities) => this.exportWidgetTypes($event, entities)
       }
     );
 
-    this.config.deleteEntityTitle = widgetType => this.translate.instant('widget.delete-widget-type-title',
-      { widgetTypeName: widgetType.name });
-    this.config.deleteEntityContent = () => this.translate.instant('widget.delete-widget-type-text');
-    this.config.deleteEntitiesTitle = count => this.translate.instant('widget.delete-widget-types-title', {count});
-    this.config.deleteEntitiesContent = () => this.translate.instant('widget.delete-widget-types-text');
+    this.config.deleteEntityTitle = widgetType => this.translate.instant('widget.delete-widget-title',
+      { widgetName: widgetType.name });
+    this.config.deleteEntityContent = () => this.translate.instant('widget.delete-widget-text');
+    this.config.deleteEntitiesTitle = count => this.translate.instant('widget.delete-widgets-title', {count});
+    this.config.deleteEntitiesContent = () => this.translate.instant('widget.delete-widgets-text');
 
 
     this.config.loadEntity = id => this.widgetsService.getWidgetTypeById(id.id);
@@ -147,7 +147,7 @@ export class WidgetTypesTableConfigResolver implements Resolve<EntityTableConfig
   }
 
   resolve(): EntityTableConfig<WidgetTypeInfo | WidgetTypeDetails> {
-    this.config.tableTitle = this.translate.instant('widget.widget-types');
+    this.config.tableTitle = this.translate.instant('widget.widgets');
     const authUser = getCurrentAuthUser(this.store);
     this.config.deleteEnabled = (widgetType) => this.isWidgetTypeEditable(widgetType, authUser.authority);
     this.config.entitySelectionEnabled = (widgetType) => this.isWidgetTypeEditable(widgetType, authUser.authority);
diff --git a/ui-ngx/src/app/modules/home/pages/widget/widgets-bundle-widgets.component.html b/ui-ngx/src/app/modules/home/pages/widget/widgets-bundle-widgets.component.html
index 2d95fd1fdb..bf1818faf1 100644
--- a/ui-ngx/src/app/modules/home/pages/widget/widgets-bundle-widgets.component.html
+++ b/ui-ngx/src/app/modules/home/pages/widget/widgets-bundle-widgets.component.html
@@ -54,14 +54,14 @@
         <button *ngIf="!editMode"
                 mat-icon-button
                 (click)="openWidgetEditor($event, widget)"
-                matTooltip="{{'widget.edit-widget-type' | translate }}"
+                matTooltip="{{ 'widget.edit' | translate }}"
                 matTooltipPosition="above">
           <mat-icon>edit</mat-icon>
         </button>
         <button *ngIf="!editMode"
                 mat-icon-button
                 (click)="exportWidgetType($event, widget)"
-                matTooltip="{{'widget-type.export' | translate }}"
+                matTooltip="{{ 'widget.export' | translate }}"
                 matTooltipPosition="above">
           <mat-icon>file_download</mat-icon>
         </button>
diff --git a/ui-ngx/src/app/shared/models/entity-type.models.ts b/ui-ngx/src/app/shared/models/entity-type.models.ts
index d7858965d7..5c9390f80f 100644
--- a/ui-ngx/src/app/shared/models/entity-type.models.ts
+++ b/ui-ngx/src/app/shared/models/entity-type.models.ts
@@ -271,14 +271,14 @@ export const entityTypeTranslations = new Map<EntityType | AliasEntityType, Enti
     [
       EntityType.WIDGET_TYPE,
       {
-        type: 'entity.type-widget-type',
-        typePlural: 'entity.type-widget-types',
-        list: 'entity.list-of-widget-types',
+        type: 'entity.type-widget',
+        typePlural: 'entity.type-widgets',
+        list: 'entity.list-of-widgets',
         details: 'widget.details',
-        add: 'widget.add-widget-type',
-        noEntities: 'widget.no-widget-types-text',
-        search: 'widget.search-widget-types',
-        selectedEntities: 'widget.selected-widget-types'
+        add: 'dashboard.add-widget',
+        noEntities: 'widget.no-widgets-text',
+        search: 'widget.search-widgets',
+        selectedEntities: 'widget.selected-widgets'
       }
     ],
     [
diff --git a/ui-ngx/src/assets/locale/locale.constant-ca_ES.json b/ui-ngx/src/assets/locale/locale.constant-ca_ES.json
index 16b72c0700..f52ed102f2 100644
--- a/ui-ngx/src/assets/locale/locale.constant-ca_ES.json
+++ b/ui-ngx/src/assets/locale/locale.constant-ca_ES.json
@@ -4532,11 +4532,7 @@
         "latest-data-key-settings-form-selector": "Selector formulari dels darrers valors",
         "javascript": "Javascript",
         "js": "JS",
-        "remove-widget-type-title": "Eliminar el tipus del widget '{{widgetName}}'?",
-        "remove-widget-type-text": "Atenció, després de la confirmació el tipus serà eliminat i la informació relacionada serà irrecuperable.",
-        "remove-widget-type": "Eliminar tipus de widget.",
         "add-widget-type": "Afegir nou tipus de widget",
-        "widget-type-load-failed-error": "Error al carregar  el tipus de widget!",
         "widget-template-load-failed-error": "Error al carregar  la plantilla del widget!",
         "add": "Afegir Widget",
         "undo": "Desfer canvis",
diff --git a/ui-ngx/src/assets/locale/locale.constant-cs_CZ.json b/ui-ngx/src/assets/locale/locale.constant-cs_CZ.json
index 1c31471928..c0950bb047 100644
--- a/ui-ngx/src/assets/locale/locale.constant-cs_CZ.json
+++ b/ui-ngx/src/assets/locale/locale.constant-cs_CZ.json
@@ -2812,11 +2812,7 @@
         "image-preview": "Náhled obrázku",
         "javascript": "Javascript",
         "js": "JS",
-        "remove-widget-type-title": "Jste si jisti, že chcete odebrat typ widgetu '{{widgetName}}'?",
-        "remove-widget-type-text": "Po potvrzení nebude možné typ widgetu ani žádná související data obnovit.",
-        "remove-widget-type": "Odebrat typ widgetu",
         "add-widget-type": "Přidat nový typ widgetu",
-        "widget-type-load-failed-error": "Nahrání typu widgetu selhalo!",
         "widget-template-load-failed-error": "Nahrání šablony widgetu selhalo!",
         "add": "Přidat widget",
         "undo": "Vrátit změny widgetu",
diff --git a/ui-ngx/src/assets/locale/locale.constant-da_DK.json b/ui-ngx/src/assets/locale/locale.constant-da_DK.json
index 7c6da04280..e815ac65c6 100644
--- a/ui-ngx/src/assets/locale/locale.constant-da_DK.json
+++ b/ui-ngx/src/assets/locale/locale.constant-da_DK.json
@@ -3327,11 +3327,7 @@
     "image-preview": "Forhåndsvisning af billede",
     "javascript": "Javascript",
     "js": "JS",
-    "remove-widget-type-title": "",
-    "remove-widget-type-text": "Efter bekræftelsen vil widget-typen og alle relaterede data være uoprettelige.",
-    "remove-widget-type": "Fjern widget-type",
     "add-widget-type": "Tilføj ny widget-type",
-    "widget-type-load-failed-error": "Kunne ikke indlæse widget-type!",
     "widget-template-load-failed-error": "Kunne ikke indlæse widget-skabelon!",
     "add": "Tilføj widget",
     "undo": "Fortryd widget-ændringer",
diff --git a/ui-ngx/src/assets/locale/locale.constant-de_DE.json b/ui-ngx/src/assets/locale/locale.constant-de_DE.json
index ab02231180..631f0f63aa 100644
--- a/ui-ngx/src/assets/locale/locale.constant-de_DE.json
+++ b/ui-ngx/src/assets/locale/locale.constant-de_DE.json
@@ -1708,11 +1708,7 @@
     "settings-schema": "Einstellungsschema",
     "datakey-settings-schema": "Datenschlüssel-Einstellungsschema",
     "javascript": "Javascript",
-    "remove-widget-type-title": "Möchten Sie den Widget-Typ '{{widgetName}}' wirklich entfernen?",
-    "remove-widget-type-text": "Nach der Bestätigung werden der Widget-Typ und alle zugehörigen Daten nicht wiederhergestellt.",
-    "remove-widget-type": "Widget-Typ entfernen",
     "add-widget-type": "Neuen Widget-Typ hinzufügen",
-    "widget-type-load-failed-error": "Widget-Typ konnte nicht geladen werden!",
     "widget-template-load-failed-error": "Widget-Vorlage konnte nicht geladen werden!",
     "add": "Widget hinzufügen",
     "undo": "Widget-Änderungen widerrufen ",
diff --git a/ui-ngx/src/assets/locale/locale.constant-el_GR.json b/ui-ngx/src/assets/locale/locale.constant-el_GR.json
index 79fce334c6..0594dd5853 100644
--- a/ui-ngx/src/assets/locale/locale.constant-el_GR.json
+++ b/ui-ngx/src/assets/locale/locale.constant-el_GR.json
@@ -2341,11 +2341,7 @@
     "settings-schema": "Ρυθμίσεις σχήματος",
     "datakey-settings-schema": "Πλήκτρο δεδομένων σχήματος ρυθμίσεων",
     "javascript": "Javascript",
-    "remove-widget-type-title": "Είστε σίγουροι ότι θέλετε να αφαιρέσετε τον τύπο Widget '{{widgetName}}'?",
-    "remove-widget-type-text": "Προσοχή, μετά την επιβεβαίωση ο τύπος Widget και όλα τα σχετικά δεδομένα θα διαγραφούν οριστικά.",
-    "remove-widget-type": "Αφαίρεση τύπου Widget",
     "add-widget-type": "Προσθήκη νέου τύπου Widget",
-    "widget-type-load-failed-error": "Αποτυχία φόρτωσης τύπου Widget!",
     "widget-template-load-failed-error": "Αποτυχία φόρτωσης προτύπου Widget!",
     "add": "Προσθήκη Widget",
     "undo": "Αναίρεση αλλαγών Widget",
diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json
index b4c0f07c85..02ac699aeb 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -2163,9 +2163,9 @@
         "type-widgets-bundle": "Widgets bundle",
         "type-widgets-bundles": "Widgets bundles",
         "list-of-widgets-bundles": "{ count, plural, =1 {One widgets bundle} other {List of # widget bundles} }",
-        "type-widget-type": "Widget type",
-        "type-widget-types": "Widget types",
-        "list-of-widget-types": "{ count, plural, =1 {One widget type} other {List of # widget types} }",
+        "type-widget": "Widget",
+        "type-widgets": "Widgets",
+        "list-of-widgets": "{ count, plural, =1 {One widget} other {List of # widgets} }",
         "search": "Search entities",
         "selected-entities": "{ count, plural, =1 {1 entity} other {# entities} } selected",
         "entity-name": "Entity name",
@@ -4764,7 +4764,6 @@
         "remove": "Remove widget",
         "delete": "Delete widget",
         "edit": "Edit widget",
-        "edit-widget-type": "Edit widget type",
         "remove-widget-title": "Are you sure you want to remove the widget '{{widgetTitle}}'?",
         "remove-widget-text": "After the confirmation the widget and all related data will become unrecoverable.",
         "timeseries": "Time series",
@@ -4781,8 +4780,8 @@
         "save": "Save widget",
         "saveAs": "Save widget as",
         "move": "Move widget",
-        "save-widget-type-as": "Save widget type as",
-        "save-widget-type-as-text": "Please enter new widget title",
+        "save-widget-as": "Save widget as",
+        "save-widget-as-text": "Please enter new widget title",
         "toggle-fullscreen": "Toggle fullscreen",
         "run": "Run widget",
         "widget-title": "Widget title",
@@ -4818,26 +4817,21 @@
         "advanced-mode": "Advanced",
         "javascript": "Javascript",
         "js": "JS",
-        "remove-widget-type-title": "Are you sure you want to remove the widget type '{{widgetName}}'?",
-        "remove-widget-type-text": "After the confirmation the widget type and all related data will become unrecoverable.",
-        "remove-widget-type": "Remove widget type",
-        "widget-types": "Widget Types",
-        "delete-widget-type-title": "Are you sure you want to delete the widget type '{{widgetTypeName}}'?",
-        "delete-widget-type-text": "After the confirmation the widget and all related data will become unrecoverable.",
-        "delete-widget-types-title": "Are you sure you want to delete { count, plural, =1 {1 widget type} other {# widget types} }?",
-        "delete-widget-types-text": "Be careful, after the confirmation all selected widget types will be removed and all related data will become unrecoverable.",
-        "delete-widget-type": "Delete widget type",
-        "add-widget-type": "Add new widget type",
-        "widget-type-load-failed-error": "Failed to load widget type!",
+        "delete-widget-title": "Are you sure you want to delete the widget '{{widgetName}}'?",
+        "delete-widget-text": "After the confirmation the widget and all related data will become unrecoverable.",
+        "delete-widgets-title": "Are you sure you want to delete { count, plural, =1 {1 widget} other {# widgets} }?",
+        "delete-widgets-text": "Be careful, after the confirmation all selected widgets will be removed and all related data will become unrecoverable.",
+        "delete-widget": "Delete widget",
         "widget-template-load-failed-error": "Failed to load widget template!",
         "details": "Details",
-        "widget-type-details": "Widget type details",
+        "widget-details": "Widget details",
         "add": "Add Widget",
-        "no-widget-types-text": "No widget types found",
-        "search-widget-types": "Search widget types",
-        "selected-widget-types": "{ count, plural, =1 {1 widget type} other {# widget types} } selected",
+        "search-widgets": "Search widgets",
+        "selected-widgets": "{ count, plural, =1 {1 widget} other {# widgets} } selected",
         "undo": "Undo widget changes",
         "export": "Export widget",
+        "export-widgets": "Export widgets",
+        "import": "Import widget",
         "no-data": "No data to display on widget",
         "data-overflow": "Widget displays {{count}} out of {{total}} entities",
         "alarm-data-overflow": "Widget displays alarms for {{allowedEntities}} (maximum allowed) entities out of {{totalEntities}} entities",
@@ -4929,7 +4923,7 @@
         "system": "System",
         "import": "Import widgets bundle",
         "export": "Export widgets bundle",
-        "export-widgets-bundle-widgets-prompt": "Include bundle widget types in exported data (otherwise only referenced widget type FQNs will be exported)",
+        "export-widgets-bundle-widgets-prompt": "Include bundle widgets in exported data (otherwise only referenced widget FQNs will be exported)",
         "export-failed-error": "Unable to export widgets bundle: {{error}}",
         "create-new-widgets-bundle": "Create new widgets bundle",
         "widgets-bundle-file": "Widgets bundle file",
@@ -5036,11 +5030,9 @@
     "widget-type": {
         "import": "Import widget type",
         "export": "Export widget type",
-        "export-widget-types": "Export widget types",
-        "export-failed-error": "Unable to export widget type: {{error}}",
-        "create-new-widget-type": "Create new widget type",
-        "widget-type-file": "Widget type file",
-        "invalid-widget-type-file-error": "Unable to import widget type: Invalid widget type data structure."
+        "export-failed-error": "Unable to export widget: {{error}}",
+        "widget-file": "Widget file",
+        "invalid-widget-file-error": "Unable to import widget: Invalid widget data structure."
     },
     "widgets": {
         "background": {
diff --git a/ui-ngx/src/assets/locale/locale.constant-es_ES.json b/ui-ngx/src/assets/locale/locale.constant-es_ES.json
index 6891156d75..f6c4b24e8a 100644
--- a/ui-ngx/src/assets/locale/locale.constant-es_ES.json
+++ b/ui-ngx/src/assets/locale/locale.constant-es_ES.json
@@ -4796,24 +4796,18 @@
         "latest-data-key-settings-form-selector": "Selector formulario de últimos valores",
         "javascript": "Javascript",
         "js": "JS",
-        "remove-widget-type-title": "¿Eliminar el tipo del widget '{{widgetName}}'?",
-        "remove-widget-type-text": "Atención, tras la confirmación el tipo será eliminado y la información relacionada será irrecuperable.",
-        "remove-widget-type": "Eliminar tipo de widget.",
         "widget-types": "Tipos de Widget",
-        "delete-widget-type-title": "¿Eliminar el tipo de widget '{{widgetTypeName}}'?",
-        "delete-widget-type-text": "Atención, tras la confirmación el tipo será eliminado y la información relacionada será irrecuperable.",
-        "delete-widget-types-title": "¿Eliminar { count, plural, =1 {1 tipo de widget} other {# tipos de widget} }?",
-        "delete-widget-types-text": "Atención, tras la confirmación los tipos de widget seleccionados serán eliminados y la información relacionada será irrecuperable.",
-        "delete-widget-type": "Borrar tipo de widget",
-        "add-widget-type": "Agregar nuevo tipo de widget",
-        "widget-type-load-failed-error": "Error al cargar el tipo de widget!",
+        "delete-widget-title": "¿Eliminar de widget '{{widgetName}}'?",
+        "delete-widget-text": "Atención, tras la confirmación será eliminado y la información relacionada será irrecuperable.",
+        "delete-widgets-title": "¿Eliminar { count, plural, =1 {1 de widget} other {# de widgets} }?",
+        "delete-widgets-text": "Atención, tras la confirmación los de widget seleccionados serán eliminados y la información relacionada será irrecuperable.",
+        "delete-widget": "Borrar de widget",
         "widget-template-load-failed-error": "Error al cargar la plantilla del widget!",
         "details": "Detalles",
-        "widget-type-details": "Detalles de tipo de widget",
+        "widget-details": "Detalles de widget",
         "add": "Agregar Widget",
-        "no-widget-types-text": "No se han encontrado tipos de widget",
-        "search-widget-types": "Buscar tipos de widget",
-        "selected-widget-types": "{ count, plural, =1 {1 tipo de widget} other {# tipos de widget} } seleccionados",
+        "search-widget": "Buscar de widget",
+        "selected-widgets": "{ count, plural, =1 {1 de widget} other {# de widgets} } seleccionados",
         "undo": "Deshacer cambios",
         "export": "Exportar widget",
         "no-data": "No hay datos para mostrar en widget",
@@ -4907,7 +4901,7 @@
         "system": "Widget de Sistema",
         "import": "Importar paquete de widgets",
         "export": "Exportar paquete de widgets",
-        "export-widgets-bundle-widgets-prompt": "Incluir tipos de widget en los datos exportados (de lo contrario, solo se exportarán los FQN de los tipos de widget a los que hace referencia)",
+        "export-widgets-bundle-widgets-prompt": "Incluir de widget en los datos exportados (de lo contrario, solo se exportarán los FQN de los tipos de widget a los que hace referencia)",
         "export-failed-error": "Imposible exportar paquete de widgets: {{error}}",
         "create-new-widgets-bundle": "Crear nuevo paquete de widgets",
         "widgets-bundle-file": "Archivo de paquete de widgets",
@@ -5014,10 +5008,8 @@
     "widget-type": {
         "import": "Importar tipo de widget",
         "export": "Exportar tipo de widget",
-        "export-widget-types": "Exportar tipos de widget",
-        "export-failed-error": "Imposible exportar tipo de widget: {{error}}",
-        "create-new-widget-type": "Crear nuevo tipo de widget",
-        "widget-type-file": "Archivo de tipo de widget",
+        "export-failed-error": "Imposible exportar de widget: {{error}}",
+        "widget-file": "Archivo de widget",
         "invalid-widget-type-file-error": "No se puede importar tipo de widget: Estructura de datos del tipo de widget es inválida."
     },
     "widgets": {
diff --git a/ui-ngx/src/assets/locale/locale.constant-fa_IR.json b/ui-ngx/src/assets/locale/locale.constant-fa_IR.json
index 43e46eee3d..222b40042a 100644
--- a/ui-ngx/src/assets/locale/locale.constant-fa_IR.json
+++ b/ui-ngx/src/assets/locale/locale.constant-fa_IR.json
@@ -1445,11 +1445,7 @@
         "settings-schema": "طرح تنظيمات",
         "datakey-settings-schema": "طرح تنظيمات کليد داده",
         "javascript": "Javascript",
-        "remove-widget-type-title": "مطمئنيد؟ '{{widgetName}}' از حذف ويجت نوع",
-        "remove-widget-type-text": ".پس از تأييد، نوع ويجت و تمامي داده هاي مربوطه غير قابل بازيابي مي شوند",
-        "remove-widget-type": "حذف نوع ويجت",
         "add-widget-type": "افزودن نوع ويجت جديد",
-        "widget-type-load-failed-error": "!عدم موفقيت در بارگذاري نوع ويجت",
         "widget-template-load-failed-error": "!عدم موفقيت در بارگذاري قالب ويجت",
         "add": "افزودن ويجت",
         "undo": "برگرداندن تغييرات ويجت",
diff --git a/ui-ngx/src/assets/locale/locale.constant-fr_FR.json b/ui-ngx/src/assets/locale/locale.constant-fr_FR.json
index ec97ca6047..9fbdfef9f4 100644
--- a/ui-ngx/src/assets/locale/locale.constant-fr_FR.json
+++ b/ui-ngx/src/assets/locale/locale.constant-fr_FR.json
@@ -2101,9 +2101,6 @@
         "remove-resource": "Supprimer une ressource",
         "remove-widget-text": "Après la confirmation, le widget et toutes les données associées deviendront irrécupérables.",
         "remove-widget-title": "Êtes-vous sûr de vouloir supprimer le widget '{{widgetTitle}}'?",
-        "remove-widget-type": "Supprimer le type de widget",
-        "remove-widget-type-text": "Après la confirmation, le type de widget et toutes les données associées deviendront irrécupérables.",
-        "remove-widget-type-title": "Êtes-vous sûr de vouloir supprimer le type de widget '{{widgetName}}'?",
         "resource-url": "URL JavaScript / CSS",
         "resources": "Ressources",
         "rpc": "Widget de contrôle",
@@ -2130,7 +2127,6 @@
         "widget-saved": "Widget enregistré",
         "widget-template-load-failed-error": "Impossible de charger le modéle de widget!",
         "widget-type-load-error": "Le widget n'a pas été chargé à cause des erreurs suivantes:",
-        "widget-type-load-failed-error": "Impossible de charger le type de widget!",
         "widget-type-not-found": "Problème de chargement de la configuration du widget. <br> Le type de widget associé a probablement été supprimé.",
         "no-data": "Aucune donnée à afficher sur le widget"
     },
diff --git a/ui-ngx/src/assets/locale/locale.constant-it_IT.json b/ui-ngx/src/assets/locale/locale.constant-it_IT.json
index 24555cc332..f2e1ffa240 100644
--- a/ui-ngx/src/assets/locale/locale.constant-it_IT.json
+++ b/ui-ngx/src/assets/locale/locale.constant-it_IT.json
@@ -1488,11 +1488,7 @@
         "settings-schema": "Impostazioni schema",
         "datakey-settings-schema": "Impostazioni Data key schema",
         "javascript": "Javascript",
-        "remove-widget-type-title": "Sei sicuro di voler rimuovere il tipo di widget '{{widgetName}}'?",
-        "remove-widget-type-text": "Dopo la conferma il tipo di widget e tutti i suoi dati non saranno più recuperabili.",
-        "remove-widget-type": "Rimuovi tipo widget",
         "add-widget-type": "Aggiungi nuovo tipo widget",
-        "widget-type-load-failed-error": "Caricamento tipo widget fallito!",
         "widget-template-load-failed-error": "Caricamento template widget fallito!",
         "add": "Aggiungi Widget",
         "undo": "Annulla modifiche widget",
diff --git a/ui-ngx/src/assets/locale/locale.constant-ja_JP.json b/ui-ngx/src/assets/locale/locale.constant-ja_JP.json
index 875b0a8266..c65928e452 100644
--- a/ui-ngx/src/assets/locale/locale.constant-ja_JP.json
+++ b/ui-ngx/src/assets/locale/locale.constant-ja_JP.json
@@ -1331,11 +1331,7 @@
 		"settings-schema": "設定スキーマ",
 		"datakey-settings-schema": "データキー設定のスキーマ",
 		"javascript": "Javascript",
-		"remove-widget-type-title": "'{{widgetName}}'?",
-		"remove-widget-type-text": "確認後、ウィジェットのタイプと関連するすべてのデータは回復不能になります。",
-		"remove-widget-type": "ウィジェットタイプを削除",
 		"add-widget-type": "新しいウィジェットタイプを追加する",
-		"widget-type-load-failed-error": "ウィジェットタイプの読み込みに失敗しました！",
 		"widget-template-load-failed-error": "ウィジェットテンプレートを読み込めませんでした！",
 		"add": "ウィジェットを追加",
 		"undo": "ウィジェットの変更を元に戻す",
diff --git a/ui-ngx/src/assets/locale/locale.constant-ka_GE.json b/ui-ngx/src/assets/locale/locale.constant-ka_GE.json
index b401c3b594..28458f0a70 100644
--- a/ui-ngx/src/assets/locale/locale.constant-ka_GE.json
+++ b/ui-ngx/src/assets/locale/locale.constant-ka_GE.json
@@ -1578,11 +1578,7 @@
     "datakey-settings-schema": "მონაცემტა გასაღები პარამეტრების სქემა",
     "javascript": "javascript",
     "js": "JS",
-    "remove-widget-type-title": "დარწმუნებული ხართ რომ გსურთ ვიჯეტის ტიპი '{{widgetName}}'?",
-    "remove-widget-type-text": "დასტურის შემთხვევაში ვიჯეტი და მასთან ასოცირებული მონაცემები დაიკარგება.",
-    "remove-widget-type": "ვიჯეტის ტიპის ამოღება",
     "add-widget-type": "ახალი ვიჯეტის ტიპი",
-    "widget-type-load-failed-error": "ვიჯეტის ტიპის ჩატვირთვა ვერ მოხერხდა!",
     "widget-template-load-failed-error": "ვიჯეტის შაბლონი ჩატვირთვა ვერ მოხერხდა!",
     "add": "ვიჯეტის დამატება",
     "undo": "ვიჯეტის ცვლილების გაუქმება",
diff --git a/ui-ngx/src/assets/locale/locale.constant-ko_KR.json b/ui-ngx/src/assets/locale/locale.constant-ko_KR.json
index a5660c5ceb..09cea16190 100644
--- a/ui-ngx/src/assets/locale/locale.constant-ko_KR.json
+++ b/ui-ngx/src/assets/locale/locale.constant-ko_KR.json
@@ -2213,11 +2213,7 @@
         "datakey-settings-schema": "데이터 키 설정 스키마",
         "javascript": "Javascript",
         "js": "JS",
-        "remove-widget-type-title": "'{{widgetName}}' 위젯 타입을 삭제하시겠습니까?",
-        "remove-widget-type-text": "위젯 타입 및 관련된 모든 데이터를 복구할 수 없으므로 주의하십시오.",
-        "remove-widget-type": "위젯 타입 삭제",
         "add-widget-type": "새로운 위젯 타입 추가",
-        "widget-type-load-failed-error": "위젯 타입을 로드하지 못했습니다!",
         "widget-template-load-failed-error": "위젯 템플릿을 로드하지 못했습니다!",
         "add": "위젯 추가",
         "undo": "위젯 변경사항 취소",
diff --git a/ui-ngx/src/assets/locale/locale.constant-lv_LV.json b/ui-ngx/src/assets/locale/locale.constant-lv_LV.json
index c489cd3402..63e7fb6db2 100644
--- a/ui-ngx/src/assets/locale/locale.constant-lv_LV.json
+++ b/ui-ngx/src/assets/locale/locale.constant-lv_LV.json
@@ -1493,11 +1493,7 @@
         "settings-schema": "Iestatījumu shēma",
         "datakey-settings-schema": "Datu atslēgas iestatījumu shēma",
         "javascript": "Javascript",
-        "remove-widget-type-title": "Vai esat pārliecināts, ka vēlaties noņemt logrīka tipu '{{widgetName}}'?",
-        "remove-widget-type-text": "Pēc apstiprinājuma logrīka tips un tā saistītie dati nebūs atjaunojami.",
-        "remove-widget-type": "Noņemt logrīka tipu",
         "add-widget-type": "Pievienot jaunu logrīka tipu",
-        "widget-type-load-failed-error": "Neveiksme ielādēt logrīka tipu!",
         "widget-template-load-failed-error": "Neveiksme ielādēt logrīka paraugu!",
         "add": "Pievienot logrīku",
         "undo": "Atcelt logrīka izmaiņas",
diff --git a/ui-ngx/src/assets/locale/locale.constant-pt_BR.json b/ui-ngx/src/assets/locale/locale.constant-pt_BR.json
index e8a105bcc2..51c8579980 100644
--- a/ui-ngx/src/assets/locale/locale.constant-pt_BR.json
+++ b/ui-ngx/src/assets/locale/locale.constant-pt_BR.json
@@ -1803,11 +1803,7 @@
     "datakey-settings-schema": "Esquema de configuração de chave de dados",
     "javascript": "Javascript",
     "js": "JS",
-    "remove-widget-type-title": "Tem certeza de que deseja remover o tipo de widget '{{widgetName}}'?",
-    "remove-widget-type-text": "Após confirmar, não será possível recuperar o tipo de widget e nenhum dado associado.",
-    "remove-widget-type": "Remover tipo de widget",
     "add-widget-type": "Adicionar novo tipo de widget",
-    "widget-type-load-failed-error": "Erro ao carregar tipo de widget!",
     "widget-template-load-failed-error": "Erro ao carregar modelo de widget!",
     "add": "Adicionar widget",
     "undo": "Desfazer alterações de widget",
diff --git a/ui-ngx/src/assets/locale/locale.constant-ro_RO.json b/ui-ngx/src/assets/locale/locale.constant-ro_RO.json
index 8ea796cbc3..67f8d839be 100644
--- a/ui-ngx/src/assets/locale/locale.constant-ro_RO.json
+++ b/ui-ngx/src/assets/locale/locale.constant-ro_RO.json
@@ -1561,11 +1561,7 @@
         "datakey-settings-schema": "Schemă setări chei date",
         "javascript": "Javascript",
         "js": "JS",
-        "remove-widget-type-title": "Sigur vrei să ștergi tip widget '{{widgetName}}'?",
-        "remove-widget-type-text": "ATENŢIE! După confirmare, tipul de widget şi toate datele aferente acestuia, vor fi șterse IREVERSIBIL!",
-        "remove-widget-type": "Şterge Tip Widget",
         "add-widget-type": "Adaugă Tip Nou Widget",
-        "widget-type-load-failed-error": "Eroare încărcare tip widget!",
         "widget-template-load-failed-error": "Eroare încarcare şablon widget!",
         "add": "Adaugă Widget Nou",
         "undo": "Anulează Modificări Widget",
diff --git a/ui-ngx/src/assets/locale/locale.constant-ru_RU.json b/ui-ngx/src/assets/locale/locale.constant-ru_RU.json
index 70aa4b3a23..5e15a3496e 100644
--- a/ui-ngx/src/assets/locale/locale.constant-ru_RU.json
+++ b/ui-ngx/src/assets/locale/locale.constant-ru_RU.json
@@ -1599,11 +1599,7 @@
         "settings-schema": "Схема конфигурации",
         "datakey-settings-schema": "Схема конфигурации ключа данных",
         "javascript": "Javascript",
-        "remove-widget-type-title": "Вы точно хотите удалить виджет '{{widgetName}}'?",
-        "remove-widget-type-text": "Внимание, после подтверждения тип виджета и все связанные с ним данные будут безвозвратно утеряны.",
-        "remove-widget-type": "Удалить тип виджета",
         "add-widget-type": "Добавить новый тип виджета",
-        "widget-type-load-failed-error": "Не удалось загрузить тип виджета!",
         "widget-template-load-failed-error": "Не удалось загрузить шаблон виджета!",
         "add": "Добавить виджет",
         "undo": "Откатить изменения в виджете",
diff --git a/ui-ngx/src/assets/locale/locale.constant-sl_SI.json b/ui-ngx/src/assets/locale/locale.constant-sl_SI.json
index f2943e6145..4fded7d020 100644
--- a/ui-ngx/src/assets/locale/locale.constant-sl_SI.json
+++ b/ui-ngx/src/assets/locale/locale.constant-sl_SI.json
@@ -2214,11 +2214,7 @@
     "datakey-settings-schema": "Shema nastavitev podatkovnega ključa",
     "javascript": "Javascript",
     "js": "JS",
-    "remove-widget-type-title": "Ali ste prepričani, da želite odstraniti vrsto pripomočka '{{widgetName}}'?",
-    "remove-widget-type-text": "Po potrditvi bodo vrsta pripomočka in vsi povezani podatki nepopravljivi.",
-    "remove-widget-type": "Odstrani vrsto pripomočka",
     "add-widget-type": "Dodaj novo vrsto pripomočka",
-    "widget-type-load-failed-error": "Vrste pripomočka ni  bilo mogoče naložiti!",
     "widget-template-load-failed-error": "Predloge pripomočka ni bilo mogoče naložiti!",
     "add": "Dodaj pripomoček",
     "undo": "Razveljavi spremembe pripomočka",
diff --git a/ui-ngx/src/assets/locale/locale.constant-tr_TR.json b/ui-ngx/src/assets/locale/locale.constant-tr_TR.json
index 50758fb1eb..e9be2e691a 100644
--- a/ui-ngx/src/assets/locale/locale.constant-tr_TR.json
+++ b/ui-ngx/src/assets/locale/locale.constant-tr_TR.json
@@ -2831,11 +2831,7 @@
     "image-preview": "Resim Önizleme",
     "javascript": "Javascript",
     "js": "JS",
-    "remove-widget-type-title": "'{{widgetName}}' isimli gösterge türünü kaldırmak istediğinizden emin misiniz?",
-    "remove-widget-type-text": "UYARI: Onaylandıktan sonra, gösterge türü ve ilgili tüm veriler geri yüklenemez şekilde silinecektir.",
-    "remove-widget-type": "Gösterge türünü kaldır",
     "add-widget-type": "Yeni gösterge türü ekle",
-    "widget-type-load-failed-error": "Gösterge türü yüklenemedi!",
     "widget-template-load-failed-error": "Gösterge şablonu yüklenemedi!",
     "add": "Gösterge ekle",
     "undo": "Gösterge değişikliklerini geri al",
diff --git a/ui-ngx/src/assets/locale/locale.constant-uk_UA.json b/ui-ngx/src/assets/locale/locale.constant-uk_UA.json
index 10d998d031..da3b6ecaee 100644
--- a/ui-ngx/src/assets/locale/locale.constant-uk_UA.json
+++ b/ui-ngx/src/assets/locale/locale.constant-uk_UA.json
@@ -2170,11 +2170,7 @@
         "settings-schema": "Схема налаштувань",
         "datakey-settings-schema": "Схема налаштувань ключів даних",
         "javascript": "Javascript",
-        "remove-widget-type-title": "Ви впевнені, що хочете видалити тип віджета '{{widgetName}}'?",
-        "remove-widget-type-text": "Будьте обережні, після підтвердження, тип віджета і всі пов'язані з ним дані стануть недоступними.",
-        "remove-widget-type": "Видалити тип віджета",
         "add-widget-type": "Додати новий тип віджета",
-        "widget-type-load-failed-error": "Не вдалося завантажити тип віджета!",
         "widget-template-load-failed-error": "Не вдалося завантажити шаблон віджета!",
         "add": "Додати віджет",
         "undo": "Скасувати зміни віджета",
diff --git a/ui-ngx/src/assets/locale/locale.constant-zh_CN.json b/ui-ngx/src/assets/locale/locale.constant-zh_CN.json
index b8c0a36fe0..5df0238594 100644
--- a/ui-ngx/src/assets/locale/locale.constant-zh_CN.json
+++ b/ui-ngx/src/assets/locale/locale.constant-zh_CN.json
@@ -3965,11 +3965,7 @@
         "latest-data-key-settings-form-selector": "最新值数据键设置表单选择器",
         "javascript": "Javascript",
         "js": "JS",
-        "remove-widget-type-title": "确定要删除部件类型 '{{widgetName}}'吗？",
-        "remove-widget-type-text": "确认后，窗口部件类型和所有相关数据将不可恢复。",
-        "remove-widget-type": "删除部件类型",
         "add-widget-type": "添加部件类型",
-        "widget-type-load-failed-error": "无法加载部件类型！",
         "widget-template-load-failed-error": "无法加载部件模板！",
         "add": "添加部件",
         "undo": "撤消部件更改",
diff --git a/ui-ngx/src/assets/locale/locale.constant-zh_TW.json b/ui-ngx/src/assets/locale/locale.constant-zh_TW.json
index 0091acbb61..85c9181ae8 100644
--- a/ui-ngx/src/assets/locale/locale.constant-zh_TW.json
+++ b/ui-ngx/src/assets/locale/locale.constant-zh_TW.json
@@ -3390,11 +3390,7 @@
         "latest-data-key-settings-form-selector": "最新資料鍵設置表單選擇器",
         "javascript": "Javascript",
         "js": "JS",
-        "remove-widget-type-title": "您確定要刪除部件類型 '{{widgetName}}'嗎？",
-        "remove-widget-type-text": "確認後，窗口部件類型和所有相關資料將無法恢復。",
-        "remove-widget-type": "刪除部件類型",
         "add-widget-type": "增加新的部件類型",
-        "widget-type-load-failed-error": "無法加載部件類型！",
         "widget-template-load-failed-error": "無法加載部件模板！",
         "add": "增加部件",
         "undo": "復原部件更改",