From c640edf1ffd5afe7f11c866a198ac1ee14e6a75e Mon Sep 17 00:00:00 2001
From: ababak <artemio.babak@gmail.com>
Date: Tue, 31 Mar 2026 10:57:00 +0300
Subject: [PATCH 1/7] Update localization: Adjust "save-to-gallery"
 translations across languages for consistency.

---
 ui-ngx/src/assets/locale/locale.constant-da_DK.json | 2 +-
 ui-ngx/src/assets/locale/locale.constant-de_DE.json | 2 +-
 ui-ngx/src/assets/locale/locale.constant-el_GR.json | 2 +-
 ui-ngx/src/assets/locale/locale.constant-en_US.json | 2 +-
 ui-ngx/src/assets/locale/locale.constant-es_ES.json | 2 +-
 ui-ngx/src/assets/locale/locale.constant-fr_FR.json | 2 +-
 ui-ngx/src/assets/locale/locale.constant-hi_IN.json | 2 +-
 ui-ngx/src/assets/locale/locale.constant-it_IT.json | 2 +-
 ui-ngx/src/assets/locale/locale.constant-ja_JP.json | 2 +-
 ui-ngx/src/assets/locale/locale.constant-nl_NL.json | 2 +-
 ui-ngx/src/assets/locale/locale.constant-no_NO.json | 2 +-
 ui-ngx/src/assets/locale/locale.constant-pt_BR.json | 2 +-
 ui-ngx/src/assets/locale/locale.constant-tr_TR.json | 2 +-
 ui-ngx/src/assets/locale/locale.constant-uk_UA.json | 2 +-
 ui-ngx/src/assets/locale/locale.constant-zh_CN.json | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

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 3ccb1678ac..c82164e608 100644
--- a/ui-ngx/src/assets/locale/locale.constant-da_DK.json
+++ b/ui-ngx/src/assets/locale/locale.constant-da_DK.json
@@ -7465,7 +7465,7 @@
       "handle-empty-result-function": "Håndtér funktion for tomt resultat",
       "handle-error-function": "Håndtér fejlfunktion",
       "handle-non-mobile-fallback-function": "Håndtér fallbackfunktion for ikke-mobil",
-      "save-to-gallery": "Gem i galleri",
+      "save-to-gallery": "Gem i Billedgalleri",
       "provision-type": "Provisioneringstype",
       "auto": "Auto",
       "wi-fi": "Wi-Fi",
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 9aefa0be37..cb16287ba5 100644
--- a/ui-ngx/src/assets/locale/locale.constant-de_DE.json
+++ b/ui-ngx/src/assets/locale/locale.constant-de_DE.json
@@ -7465,7 +7465,7 @@
       "handle-empty-result-function": "Funktion zum Verarbeiten eines leeren Ergebnisses",
       "handle-error-function": "Funktion zum Verarbeiten eines Fehlers",
       "handle-non-mobile-fallback-function": "Fallback-Funktion für Nicht-Mobile",
-      "save-to-gallery": "In Galerie speichern",
+      "save-to-gallery": "In Bildergalerie speichern",
       "provision-type": "Provisioning-Typ",
       "auto": "Auto",
       "wi-fi": "WLAN",
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 8e238b0f3b..5a5413fbc1 100644
--- a/ui-ngx/src/assets/locale/locale.constant-el_GR.json
+++ b/ui-ngx/src/assets/locale/locale.constant-el_GR.json
@@ -7465,7 +7465,7 @@
       "handle-empty-result-function": "Συνάρτηση χειρισμού κενού αποτελέσματος",
       "handle-error-function": "Συνάρτηση χειρισμού σφάλματος",
       "handle-non-mobile-fallback-function": "Συνάρτηση εναλλακτικής διαχείρισης για μη κινητά",
-      "save-to-gallery": "Αποθήκευση στη συλλογή",
+      "save-to-gallery": "Αποθήκευση στη Συλλογή εικόνων",
       "provision-type": "Τύπος παροχής",
       "auto": "Αυτόματο",
       "wi-fi": "Wi-Fi",
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 116ff4b4c4..eeb05f1f68 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -7481,7 +7481,7 @@
           "handle-empty-result-function": "Handle empty result function",
           "handle-error-function": "Handle error function",
           "handle-non-mobile-fallback-function": "Handle Non-Mobile fallback function",
-          "save-to-gallery": "Save to gallery",
+          "save-to-gallery": "Save to Image gallery",
           "provision-type": "Provision type",
           "auto": "Auto",
           "wi-fi": "Wi-Fi",
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 d6c30dfd40..d4b678b223 100644
--- a/ui-ngx/src/assets/locale/locale.constant-es_ES.json
+++ b/ui-ngx/src/assets/locale/locale.constant-es_ES.json
@@ -7465,7 +7465,7 @@
       "handle-empty-result-function": "Gestionar función de resultado vacío",
       "handle-error-function": "Gestionar función de error",
       "handle-non-mobile-fallback-function": "Gestionar función de alternativa para no móvil",
-      "save-to-gallery": "Guardar en la galería",
+      "save-to-gallery": "Guardar en la Galería de imágenes",
       "provision-type": "Tipo de aprovisionamiento",
       "auto": "Automático",
       "wi-fi": "Wi-Fi",
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 7f03212914..a7904dd037 100644
--- a/ui-ngx/src/assets/locale/locale.constant-fr_FR.json
+++ b/ui-ngx/src/assets/locale/locale.constant-fr_FR.json
@@ -7465,7 +7465,7 @@
       "handle-empty-result-function": "Gérer la fonction de résultat vide",
       "handle-error-function": "Gérer la fonction d’erreur",
       "handle-non-mobile-fallback-function": "Gérer la fonction de repli non mobile",
-      "save-to-gallery": "Enregistrer dans la galerie",
+      "save-to-gallery": "Enregistrer dans la Galerie d'images",
       "provision-type": "Type de provisionnement",
       "auto": "Auto",
       "wi-fi": "Wi-Fi",
diff --git a/ui-ngx/src/assets/locale/locale.constant-hi_IN.json b/ui-ngx/src/assets/locale/locale.constant-hi_IN.json
index afd71d0305..5732909fcd 100644
--- a/ui-ngx/src/assets/locale/locale.constant-hi_IN.json
+++ b/ui-ngx/src/assets/locale/locale.constant-hi_IN.json
@@ -7465,7 +7465,7 @@
       "handle-empty-result-function": "खाली परिणाम फ़ंक्शन को हैंडल करें",
       "handle-error-function": "त्रुटि फ़ंक्शन को हैंडल करें",
       "handle-non-mobile-fallback-function": "नॉन-मोबाइल फ़ॉलबैक फ़ंक्शन को हैंडल करें",
-      "save-to-gallery": "गैलरी में सहेजें",
+      "save-to-gallery": "इमेज गैलरी में सहेजें",
       "provision-type": "प्रोविजन प्रकार",
       "auto": "स्वचालित",
       "wi-fi": "Wi-Fi",
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 d2173f7631..df787556cf 100644
--- a/ui-ngx/src/assets/locale/locale.constant-it_IT.json
+++ b/ui-ngx/src/assets/locale/locale.constant-it_IT.json
@@ -7465,7 +7465,7 @@
       "handle-empty-result-function": "Funzione per gestire il risultato vuoto",
       "handle-error-function": "Funzione per gestire l'errore",
       "handle-non-mobile-fallback-function": "Funzione per gestire il fallback Non-Mobile",
-      "save-to-gallery": "Salva nella galleria",
+      "save-to-gallery": "Salva nella Galleria Immagini",
       "provision-type": "Tipo di provision",
       "auto": "Auto",
       "wi-fi": "Wi-Fi",
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 9eb965a9e9..4484cacb42 100644
--- a/ui-ngx/src/assets/locale/locale.constant-ja_JP.json
+++ b/ui-ngx/src/assets/locale/locale.constant-ja_JP.json
@@ -7465,7 +7465,7 @@
       "handle-empty-result-function": "空結果処理関数",
       "handle-error-function": "エラー処理関数",
       "handle-non-mobile-fallback-function": "非モバイルフォールバック処理関数",
-      "save-to-gallery": "ギャラリーに保存",
+      "save-to-gallery": "画像ギャラリーに保存",
       "provision-type": "プロビジョニングタイプ",
       "auto": "自動",
       "wi-fi": "Wi-Fi",
diff --git a/ui-ngx/src/assets/locale/locale.constant-nl_NL.json b/ui-ngx/src/assets/locale/locale.constant-nl_NL.json
index 49923f7ae3..73853bcc44 100644
--- a/ui-ngx/src/assets/locale/locale.constant-nl_NL.json
+++ b/ui-ngx/src/assets/locale/locale.constant-nl_NL.json
@@ -7465,7 +7465,7 @@
       "handle-empty-result-function": "Leegresultaatfunctie afhandelen",
       "handle-error-function": "Foutfunctie afhandelen",
       "handle-non-mobile-fallback-function": "Non-Mobile-terugvalfunctie afhandelen",
-      "save-to-gallery": "Opslaan in galerij",
+      "save-to-gallery": "Opslaan in Afbeeldingsgalerij",
       "provision-type": "Provisioningtype",
       "auto": "Auto",
       "wi-fi": "Wi-Fi",
diff --git a/ui-ngx/src/assets/locale/locale.constant-no_NO.json b/ui-ngx/src/assets/locale/locale.constant-no_NO.json
index 80c1467767..f559b8395b 100644
--- a/ui-ngx/src/assets/locale/locale.constant-no_NO.json
+++ b/ui-ngx/src/assets/locale/locale.constant-no_NO.json
@@ -7465,7 +7465,7 @@
       "handle-empty-result-function": "Håndter funksjon for tomt resultat",
       "handle-error-function": "Håndter feilfunksjon",
       "handle-non-mobile-fallback-function": "Håndter fallback-funksjon for ikke-mobil",
-      "save-to-gallery": "Lagre i galleri",
+      "save-to-gallery": "Lagre i Bildegalleriet",
       "provision-type": "Klargjøringstype",
       "auto": "Auto",
       "wi-fi": "Wi-Fi",
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 094b013595..d3410a6bef 100644
--- a/ui-ngx/src/assets/locale/locale.constant-pt_BR.json
+++ b/ui-ngx/src/assets/locale/locale.constant-pt_BR.json
@@ -7465,7 +7465,7 @@
       "handle-empty-result-function": "Função para tratar resultado vazio",
       "handle-error-function": "Função para tratar erro",
       "handle-non-mobile-fallback-function": "Função de fallback para ambiente não mobile",
-      "save-to-gallery": "Salvar na galeria",
+      "save-to-gallery": "Salvar na Galeria de Imagens",
       "provision-type": "Tipo de provisionamento",
       "auto": "Automático",
       "wi-fi": "Wi-Fi",
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 e6330ad5e6..e6dfda3796 100644
--- a/ui-ngx/src/assets/locale/locale.constant-tr_TR.json
+++ b/ui-ngx/src/assets/locale/locale.constant-tr_TR.json
@@ -7465,7 +7465,7 @@
       "handle-empty-result-function": "Boş sonuç fonksiyonunu işle",
       "handle-error-function": "Hata fonksiyonunu işle",
       "handle-non-mobile-fallback-function": "Mobil olmayan geri dönüş fonksiyonunu işle",
-      "save-to-gallery": "Galeriye kaydet",
+      "save-to-gallery": "Resim Galerisi'ne kaydet",
       "provision-type": "Sağlama türü",
       "auto": "Otomatik",
       "wi-fi": "Wi-Fi",
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 d06fe89631..b12b8e2c20 100644
--- a/ui-ngx/src/assets/locale/locale.constant-uk_UA.json
+++ b/ui-ngx/src/assets/locale/locale.constant-uk_UA.json
@@ -7465,7 +7465,7 @@
       "handle-empty-result-function": "Функція обробки порожнього результату",
       "handle-error-function": "Функція обробки помилки",
       "handle-non-mobile-fallback-function": "Функція обробки резервної ситуації для не мобільних пристроїв",
-      "save-to-gallery": "Зберегти в галерею",
+      "save-to-gallery": "Зберегти в Галерею зображень",
       "provision-type": "Тип налаштування",
       "auto": "Авто",
       "wi-fi": "Wi-Fi",
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 68b08996e3..d5ba206776 100644
--- a/ui-ngx/src/assets/locale/locale.constant-zh_CN.json
+++ b/ui-ngx/src/assets/locale/locale.constant-zh_CN.json
@@ -7465,7 +7465,7 @@
       "handle-empty-result-function": "处理空结果函数",
       "handle-error-function": "处理错误函数",
       "handle-non-mobile-fallback-function": "处理非移动端回退函数",
-      "save-to-gallery": "保存到相册",
+      "save-to-gallery": "保存到图片库",
       "provision-type": "配网类型",
       "auto": "自动",
       "wi-fi": "Wi-Fi",

From 145ae066bcfe3576647dc134597eb36878e87c89 Mon Sep 17 00:00:00 2001
From: ababak <artemio.babak@gmail.com>
Date: Wed, 1 Apr 2026 15:19:43 +0300
Subject: [PATCH 2/7] Update localization: Add quotes to "save-to-gallery"
 translations for consistency across all languages.

---
 ui-ngx/src/assets/locale/locale.constant-da_DK.json | 2 +-
 ui-ngx/src/assets/locale/locale.constant-de_DE.json | 2 +-
 ui-ngx/src/assets/locale/locale.constant-el_GR.json | 2 +-
 ui-ngx/src/assets/locale/locale.constant-en_US.json | 2 +-
 ui-ngx/src/assets/locale/locale.constant-es_ES.json | 2 +-
 ui-ngx/src/assets/locale/locale.constant-fr_FR.json | 2 +-
 ui-ngx/src/assets/locale/locale.constant-hi_IN.json | 2 +-
 ui-ngx/src/assets/locale/locale.constant-it_IT.json | 2 +-
 ui-ngx/src/assets/locale/locale.constant-ja_JP.json | 2 +-
 ui-ngx/src/assets/locale/locale.constant-nl_NL.json | 2 +-
 ui-ngx/src/assets/locale/locale.constant-no_NO.json | 2 +-
 ui-ngx/src/assets/locale/locale.constant-pt_BR.json | 2 +-
 ui-ngx/src/assets/locale/locale.constant-tr_TR.json | 2 +-
 ui-ngx/src/assets/locale/locale.constant-uk_UA.json | 2 +-
 ui-ngx/src/assets/locale/locale.constant-zh_CN.json | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

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 c82164e608..972c2073e5 100644
--- a/ui-ngx/src/assets/locale/locale.constant-da_DK.json
+++ b/ui-ngx/src/assets/locale/locale.constant-da_DK.json
@@ -7465,7 +7465,7 @@
       "handle-empty-result-function": "Håndtér funktion for tomt resultat",
       "handle-error-function": "Håndtér fejlfunktion",
       "handle-non-mobile-fallback-function": "Håndtér fallbackfunktion for ikke-mobil",
-      "save-to-gallery": "Gem i Billedgalleri",
+      "save-to-gallery": "Gem i 'Billedgalleri'",
       "provision-type": "Provisioneringstype",
       "auto": "Auto",
       "wi-fi": "Wi-Fi",
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 cb16287ba5..fa579a38fb 100644
--- a/ui-ngx/src/assets/locale/locale.constant-de_DE.json
+++ b/ui-ngx/src/assets/locale/locale.constant-de_DE.json
@@ -7465,7 +7465,7 @@
       "handle-empty-result-function": "Funktion zum Verarbeiten eines leeren Ergebnisses",
       "handle-error-function": "Funktion zum Verarbeiten eines Fehlers",
       "handle-non-mobile-fallback-function": "Fallback-Funktion für Nicht-Mobile",
-      "save-to-gallery": "In Bildergalerie speichern",
+      "save-to-gallery": "In 'Bildergalerie' speichern",
       "provision-type": "Provisioning-Typ",
       "auto": "Auto",
       "wi-fi": "WLAN",
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 5a5413fbc1..fc27540d2d 100644
--- a/ui-ngx/src/assets/locale/locale.constant-el_GR.json
+++ b/ui-ngx/src/assets/locale/locale.constant-el_GR.json
@@ -7465,7 +7465,7 @@
       "handle-empty-result-function": "Συνάρτηση χειρισμού κενού αποτελέσματος",
       "handle-error-function": "Συνάρτηση χειρισμού σφάλματος",
       "handle-non-mobile-fallback-function": "Συνάρτηση εναλλακτικής διαχείρισης για μη κινητά",
-      "save-to-gallery": "Αποθήκευση στη Συλλογή εικόνων",
+      "save-to-gallery": "Αποθήκευση στη 'Συλλογή εικόνων'",
       "provision-type": "Τύπος παροχής",
       "auto": "Αυτόματο",
       "wi-fi": "Wi-Fi",
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 eeb05f1f68..9a2915634b 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -7481,7 +7481,7 @@
           "handle-empty-result-function": "Handle empty result function",
           "handle-error-function": "Handle error function",
           "handle-non-mobile-fallback-function": "Handle Non-Mobile fallback function",
-          "save-to-gallery": "Save to Image gallery",
+          "save-to-gallery": "Save to 'Image gallery'",
           "provision-type": "Provision type",
           "auto": "Auto",
           "wi-fi": "Wi-Fi",
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 d4b678b223..530ca3a1d2 100644
--- a/ui-ngx/src/assets/locale/locale.constant-es_ES.json
+++ b/ui-ngx/src/assets/locale/locale.constant-es_ES.json
@@ -7465,7 +7465,7 @@
       "handle-empty-result-function": "Gestionar función de resultado vacío",
       "handle-error-function": "Gestionar función de error",
       "handle-non-mobile-fallback-function": "Gestionar función de alternativa para no móvil",
-      "save-to-gallery": "Guardar en la Galería de imágenes",
+      "save-to-gallery": "Guardar en la 'Galería de imágenes'",
       "provision-type": "Tipo de aprovisionamiento",
       "auto": "Automático",
       "wi-fi": "Wi-Fi",
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 a7904dd037..b9c18af3bd 100644
--- a/ui-ngx/src/assets/locale/locale.constant-fr_FR.json
+++ b/ui-ngx/src/assets/locale/locale.constant-fr_FR.json
@@ -7465,7 +7465,7 @@
       "handle-empty-result-function": "Gérer la fonction de résultat vide",
       "handle-error-function": "Gérer la fonction d’erreur",
       "handle-non-mobile-fallback-function": "Gérer la fonction de repli non mobile",
-      "save-to-gallery": "Enregistrer dans la Galerie d'images",
+      "save-to-gallery": "Enregistrer dans la 'Galerie d'images'",
       "provision-type": "Type de provisionnement",
       "auto": "Auto",
       "wi-fi": "Wi-Fi",
diff --git a/ui-ngx/src/assets/locale/locale.constant-hi_IN.json b/ui-ngx/src/assets/locale/locale.constant-hi_IN.json
index 5732909fcd..bf4ec73795 100644
--- a/ui-ngx/src/assets/locale/locale.constant-hi_IN.json
+++ b/ui-ngx/src/assets/locale/locale.constant-hi_IN.json
@@ -7465,7 +7465,7 @@
       "handle-empty-result-function": "खाली परिणाम फ़ंक्शन को हैंडल करें",
       "handle-error-function": "त्रुटि फ़ंक्शन को हैंडल करें",
       "handle-non-mobile-fallback-function": "नॉन-मोबाइल फ़ॉलबैक फ़ंक्शन को हैंडल करें",
-      "save-to-gallery": "इमेज गैलरी में सहेजें",
+      "save-to-gallery": "'इमेज गैलरी' में सहेजें",
       "provision-type": "प्रोविजन प्रकार",
       "auto": "स्वचालित",
       "wi-fi": "Wi-Fi",
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 df787556cf..921484d0ec 100644
--- a/ui-ngx/src/assets/locale/locale.constant-it_IT.json
+++ b/ui-ngx/src/assets/locale/locale.constant-it_IT.json
@@ -7465,7 +7465,7 @@
       "handle-empty-result-function": "Funzione per gestire il risultato vuoto",
       "handle-error-function": "Funzione per gestire l'errore",
       "handle-non-mobile-fallback-function": "Funzione per gestire il fallback Non-Mobile",
-      "save-to-gallery": "Salva nella Galleria Immagini",
+      "save-to-gallery": "Salva nella 'Galleria Immagini'",
       "provision-type": "Tipo di provision",
       "auto": "Auto",
       "wi-fi": "Wi-Fi",
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 4484cacb42..aeca4f3811 100644
--- a/ui-ngx/src/assets/locale/locale.constant-ja_JP.json
+++ b/ui-ngx/src/assets/locale/locale.constant-ja_JP.json
@@ -7465,7 +7465,7 @@
       "handle-empty-result-function": "空結果処理関数",
       "handle-error-function": "エラー処理関数",
       "handle-non-mobile-fallback-function": "非モバイルフォールバック処理関数",
-      "save-to-gallery": "画像ギャラリーに保存",
+      "save-to-gallery": "'画像ギャラリー'に保存",
       "provision-type": "プロビジョニングタイプ",
       "auto": "自動",
       "wi-fi": "Wi-Fi",
diff --git a/ui-ngx/src/assets/locale/locale.constant-nl_NL.json b/ui-ngx/src/assets/locale/locale.constant-nl_NL.json
index 73853bcc44..35d82c648e 100644
--- a/ui-ngx/src/assets/locale/locale.constant-nl_NL.json
+++ b/ui-ngx/src/assets/locale/locale.constant-nl_NL.json
@@ -7465,7 +7465,7 @@
       "handle-empty-result-function": "Leegresultaatfunctie afhandelen",
       "handle-error-function": "Foutfunctie afhandelen",
       "handle-non-mobile-fallback-function": "Non-Mobile-terugvalfunctie afhandelen",
-      "save-to-gallery": "Opslaan in Afbeeldingsgalerij",
+      "save-to-gallery": "Opslaan in 'Afbeeldingsgalerij'",
       "provision-type": "Provisioningtype",
       "auto": "Auto",
       "wi-fi": "Wi-Fi",
diff --git a/ui-ngx/src/assets/locale/locale.constant-no_NO.json b/ui-ngx/src/assets/locale/locale.constant-no_NO.json
index f559b8395b..5f8be023df 100644
--- a/ui-ngx/src/assets/locale/locale.constant-no_NO.json
+++ b/ui-ngx/src/assets/locale/locale.constant-no_NO.json
@@ -7465,7 +7465,7 @@
       "handle-empty-result-function": "Håndter funksjon for tomt resultat",
       "handle-error-function": "Håndter feilfunksjon",
       "handle-non-mobile-fallback-function": "Håndter fallback-funksjon for ikke-mobil",
-      "save-to-gallery": "Lagre i Bildegalleriet",
+      "save-to-gallery": "Lagre i 'Bildegalleriet'",
       "provision-type": "Klargjøringstype",
       "auto": "Auto",
       "wi-fi": "Wi-Fi",
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 d3410a6bef..45e004deb4 100644
--- a/ui-ngx/src/assets/locale/locale.constant-pt_BR.json
+++ b/ui-ngx/src/assets/locale/locale.constant-pt_BR.json
@@ -7465,7 +7465,7 @@
       "handle-empty-result-function": "Função para tratar resultado vazio",
       "handle-error-function": "Função para tratar erro",
       "handle-non-mobile-fallback-function": "Função de fallback para ambiente não mobile",
-      "save-to-gallery": "Salvar na Galeria de Imagens",
+      "save-to-gallery": "Salvar na 'Galeria de Imagens'",
       "provision-type": "Tipo de provisionamento",
       "auto": "Automático",
       "wi-fi": "Wi-Fi",
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 e6dfda3796..a750a7ec70 100644
--- a/ui-ngx/src/assets/locale/locale.constant-tr_TR.json
+++ b/ui-ngx/src/assets/locale/locale.constant-tr_TR.json
@@ -7465,7 +7465,7 @@
       "handle-empty-result-function": "Boş sonuç fonksiyonunu işle",
       "handle-error-function": "Hata fonksiyonunu işle",
       "handle-non-mobile-fallback-function": "Mobil olmayan geri dönüş fonksiyonunu işle",
-      "save-to-gallery": "Resim Galerisi'ne kaydet",
+      "save-to-gallery": "'Resim Galerisi'ne kaydet",
       "provision-type": "Sağlama türü",
       "auto": "Otomatik",
       "wi-fi": "Wi-Fi",
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 b12b8e2c20..844fb4148c 100644
--- a/ui-ngx/src/assets/locale/locale.constant-uk_UA.json
+++ b/ui-ngx/src/assets/locale/locale.constant-uk_UA.json
@@ -7465,7 +7465,7 @@
       "handle-empty-result-function": "Функція обробки порожнього результату",
       "handle-error-function": "Функція обробки помилки",
       "handle-non-mobile-fallback-function": "Функція обробки резервної ситуації для не мобільних пристроїв",
-      "save-to-gallery": "Зберегти в Галерею зображень",
+      "save-to-gallery": "Зберегти в 'Галерею зображень'",
       "provision-type": "Тип налаштування",
       "auto": "Авто",
       "wi-fi": "Wi-Fi",
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 d5ba206776..1c399fddaf 100644
--- a/ui-ngx/src/assets/locale/locale.constant-zh_CN.json
+++ b/ui-ngx/src/assets/locale/locale.constant-zh_CN.json
@@ -7465,7 +7465,7 @@
       "handle-empty-result-function": "处理空结果函数",
       "handle-error-function": "处理错误函数",
       "handle-non-mobile-fallback-function": "处理非移动端回退函数",
-      "save-to-gallery": "保存到图片库",
+      "save-to-gallery": "保存到'图片库'",
       "provision-type": "配网类型",
       "auto": "自动",
       "wi-fi": "Wi-Fi",

From 77e3b5cd8d4906f9f6eefa75231a611ed9d5214f Mon Sep 17 00:00:00 2001
From: Maksym Tsymbarov <mtsymbarov@thingsboard.io>
Date: Fri, 3 Apr 2026 16:10:45 +0200
Subject: [PATCH 3/7] Add condition to not display "Add Telemetry" button for
 Entity view type

---
 .../home/components/attribute/attribute-table.component.html | 2 +-
 .../home/components/attribute/attribute-table.component.ts   | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.html b/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.html
index 6d758b8c7b..c7d204884b 100644
--- a/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.html
+++ b/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.html
@@ -34,7 +34,7 @@
         </div>
         <span class="flex-1"></span>
         <button mat-icon-button
-                *ngIf="attributeScope !== attributeScopeTypes.CLIENT_SCOPE"
+                *ngIf="attributeScope !== attributeScopeTypes.CLIENT_SCOPE && !disableAddTelemetry"
                 [disabled]="isLoading$ | async"
                 (click)="addAttribute($event)"
                 matTooltip="{{ 'action.add' | translate }}"
diff --git a/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.ts b/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.ts
index 2962307e4c..c3bac7cec5 100644
--- a/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.ts
+++ b/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.ts
@@ -121,6 +121,7 @@ export class AttributeTableComponent extends PageComponent implements AfterViewI
   activeValue = false;
   dirtyValue = false;
   entityIdValue: EntityId;
+  entityType = EntityType;
 
   attributeScopeSelectionReadonly = false;
 
@@ -143,6 +144,10 @@ export class AttributeTableComponent extends PageComponent implements AfterViewI
     return this.disableAttributeScopeSelectionValue;
   }
 
+  get disableAddTelemetry(): boolean {
+    return this.defaultAttributeScope === this.latestTelemetryTypes.LATEST_TELEMETRY && this.entityType.ENTITY_VIEW === this.entityIdValue.entityType;
+  }
+
   @Input()
   set disableAttributeScopeSelection(value: boolean) {
     this.disableAttributeScopeSelectionValue = coerceBooleanProperty(value);

From 3d97078ae2582eade96b97b3578579f160b26aa9 Mon Sep 17 00:00:00 2001
From: Maksym Tsymbarov <mtsymbarov@thingsboard.io>
Date: Mon, 6 Apr 2026 11:07:31 +0200
Subject: [PATCH 4/7] Changed approach

---
 .../components/attribute/attribute-table.component.ts     | 8 ++++----
 .../pages/entity-view/entity-view-tabs.component.html     | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.ts b/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.ts
index c3bac7cec5..fe53f4d988 100644
--- a/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.ts
+++ b/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.ts
@@ -90,6 +90,7 @@ import { Filters } from '@shared/models/query/query.models';
 import { hidePageSizePixelValue } from '@shared/models/constants';
 import { DeleteTimeseriesPanelComponent } from '@home/components/attribute/delete-timeseries-panel.component';
 import { FormBuilder } from '@angular/forms';
+import { coerceBoolean } from '@shared/decorators/coercion';
 
 @Component({
     selector: 'tb-attribute-table',
@@ -121,7 +122,6 @@ export class AttributeTableComponent extends PageComponent implements AfterViewI
   activeValue = false;
   dirtyValue = false;
   entityIdValue: EntityId;
-  entityType = EntityType;
 
   attributeScopeSelectionReadonly = false;
 
@@ -144,9 +144,9 @@ export class AttributeTableComponent extends PageComponent implements AfterViewI
     return this.disableAttributeScopeSelectionValue;
   }
 
-  get disableAddTelemetry(): boolean {
-    return this.defaultAttributeScope === this.latestTelemetryTypes.LATEST_TELEMETRY && this.entityType.ENTITY_VIEW === this.entityIdValue.entityType;
-  }
+  @Input()
+  @coerceBoolean()
+  disableAddTelemetry: boolean;
 
   @Input()
   set disableAttributeScopeSelection(value: boolean) {
diff --git a/ui-ngx/src/app/modules/home/pages/entity-view/entity-view-tabs.component.html b/ui-ngx/src/app/modules/home/pages/entity-view/entity-view-tabs.component.html
index b3e1ee2883..3853a0f7e9 100644
--- a/ui-ngx/src/app/modules/home/pages/entity-view/entity-view-tabs.component.html
+++ b/ui-ngx/src/app/modules/home/pages/entity-view/entity-view-tabs.component.html
@@ -27,6 +27,7 @@
          label="{{ 'attribute.latest-telemetry' | translate }}" #telemetryTab="matTab">
   <tb-attribute-table [defaultAttributeScope]="latestTelemetryTypes.LATEST_TELEMETRY"
                       disableAttributeScopeSelection
+                      disableAddTelemetry
                       [active]="telemetryTab.isActive"
                       [entityId]="entity.id"
                       [entityName]="entity.name">

From 036cb087847df470a936d38a20eceef6c2623f37 Mon Sep 17 00:00:00 2001
From: Vladyslav_Prykhodko <vprykhodko@thingsboard.io>
Date: Mon, 6 Apr 2026 18:53:27 +0300
Subject: [PATCH 5/7] Added @angular/core/rxjs-interop to modules map

---
 ui-ngx/src/app/modules/common/modules-map.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ui-ngx/src/app/modules/common/modules-map.ts b/ui-ngx/src/app/modules/common/modules-map.ts
index 32c315fcf8..7ccad1c91e 100644
--- a/ui-ngx/src/app/modules/common/modules-map.ts
+++ b/ui-ngx/src/app/modules/common/modules-map.ts
@@ -16,6 +16,7 @@
 
 import * as AngularAnimations from '@angular/animations';
 import * as AngularCore from '@angular/core';
+import * as AngularCoreRxjsInterop from '@angular/core/rxjs-interop';
 import * as AngularCommon from '@angular/common';
 import * as AngularForms from '@angular/forms';
 import * as AngularPlatformBrowser from '@angular/platform-browser';
@@ -352,6 +353,7 @@ class ModulesMap implements IModulesMap {
   private modulesMap: {[key: string]: any} = {
     '@angular/animations': AngularAnimations,
     '@angular/core': this.angularCoreModule20to18Patch(AngularCore),
+    '@angular/core/rxjs-interop': AngularCoreRxjsInterop,
     '@angular/common': AngularCommon,
     '@angular/common/http': HttpClientModule,
     '@angular/forms': AngularForms,

From 9fed9c789fc929c6fd11500125483928d399b1c4 Mon Sep 17 00:00:00 2001
From: Maksym Tsymbarov <mtsymbarov@thingsboard.io>
Date: Wed, 1 Apr 2026 12:47:15 +0200
Subject: [PATCH 6/7] Fixed Datasource determination for autocomplete patterns
 if datasource is empty

---
 .../src/app/modules/home/models/widget-component.models.ts  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/models/widget-component.models.ts b/ui-ngx/src/app/modules/home/models/widget-component.models.ts
index 5685487b3f..4cf6eb68ec 100644
--- a/ui-ngx/src/app/modules/home/models/widget-component.models.ts
+++ b/ui-ngx/src/app/modules/home/models/widget-component.models.ts
@@ -68,7 +68,7 @@ import {
   formatValue,
   getEntityDetailsPageURL,
   hasDatasourceLabelsVariables,
-  isDefined
+  isDefined, isDefinedAndNotNull
 } from '@core/utils';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
@@ -555,7 +555,9 @@ export class LabelVariablePattern {
         const entityInfo = this.ctx.defaultSubscription.getFirstEntityInfo();
         label = createLabelFromSubscriptionEntityInfo(entityInfo, label);
       } else {
-        const datasource = this.ctx.defaultSubscription?.firstDatasource ?? (this.ctx as any).mapInstance?.getData()[0];
+        const datasource = isDefinedAndNotNull(this.ctx.defaultSubscription)
+          ? this.ctx.defaultSubscription.firstDatasource ?? undefined
+          : (this.ctx as any).mapInstance?.getData()[0];
         label = createLabelFromDatasource(datasource, label);
       }
     }

From 6f790b9da2181c37eb4e1d658cafb1232f6c0f67 Mon Sep 17 00:00:00 2001
From: Maksym Tsymbarov <mtsymbarov@thingsboard.io>
Date: Fri, 3 Apr 2026 13:55:56 +0200
Subject: [PATCH 7/7] Fixed hint alignment for propagate alarm rule field

---
 .../home/components/alarm-rules/alarm-rules.component.html       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui-ngx/src/app/modules/home/components/alarm-rules/alarm-rules.component.html b/ui-ngx/src/app/modules/home/components/alarm-rules/alarm-rules.component.html
index c7fd7da063..a5903e1019 100644
--- a/ui-ngx/src/app/modules/home/components/alarm-rules/alarm-rules.component.html
+++ b/ui-ngx/src/app/modules/home/components/alarm-rules/alarm-rules.component.html
@@ -138,6 +138,7 @@
                                       placeholder="{{ 'alarm-rule.alarm-rule-relation-types-list' | translate }}"
                                       hint="{{ 'alarm-rule.alarm-rule-relation-types-list-hint' | translate }}"
                                       [predefinedValues]="predefinedTypeValues"
+                                      subscriptSizing="dynamic"
                                       allowUserValue
                                       formControlName="propagateRelationTypes">
                 </tb-string-items-list>