diff --git a/ui/src/app/locale/locale.constant-cs_CZ.json b/ui/src/app/locale/locale.constant-cs_CZ.json
index 8e8a6b8a2f..d3fc57cbe7 100644
--- a/ui/src/app/locale/locale.constant-cs_CZ.json
+++ b/ui/src/app/locale/locale.constant-cs_CZ.json
@@ -1639,21 +1639,23 @@
     "language": {
         "language": "Jazyk",
         "locales": {
-            "de_DE": "German",
-            "fr_FR": "French",
-            "zh_CN": "Chinese",
+            "de_DE": "Deutsch",
+            "fr_FR": "Français",
+            "zh_CN": "简体中文",
+            "zh_TW": "繁體中文",
             "en_US": "English",
-            "it_IT": "Italian",
-            "ko_KR": "Korean",
-            "ru_RU": "Russian",
-            "es_ES": "Spanish",
-            "ja_JA": "Japanese",
-            "tr_TR": "Turkish",
-            "fa_IR": "Persian",
-            "uk_UA": "Ukrainian",
+            "it_IT": "Italiano",
+            "ko_KR": "한글",
+            "ru_RU": "Русский",
+            "es_ES": "Español",
+            "ja_JA": "日本語",
+            "tr_TR": "Türkçe",
+            "fa_IR": "فارسي",
+            "uk_UA": "Українська",
             "cs_CZ": "Česky",
-            "el_GR": "Řečtina",
-            "lv_LV": "Lotyština"
+            "el_GR": "Ελληνικά",
+            "ro_RO": "Română",
+            "lv_LV": "Latviešu"
         }
     }
 }
diff --git a/ui/src/app/locale/locale.constant-de_DE.json b/ui/src/app/locale/locale.constant-de_DE.json
index d5f43f4ef4..c686ab6415 100644
--- a/ui/src/app/locale/locale.constant-de_DE.json
+++ b/ui/src/app/locale/locale.constant-de_DE.json
@@ -1686,22 +1686,24 @@
   },
   "language": {
     "language": "Sprache",
-    "locales": {
-      "de_DE": "Deutsch",
-      "fr_FR": "Französisch",
-      "zh_CN": "Chinesisch",
-      "en_US": "Englisch",
-      "it_IT": "Italienisch",
-      "ko_KR": "Koreanisch",
-      "ru_RU": "Russisch",
-      "es_ES": "Spanisch",
-      "ja_JA": "Japanisch",
-      "tr_TR": "Türkisch",
-      "fa_IR": "Persisch",
-      "uk_UA": "Ukrainisch",
-      "cs_CZ": "Tschechisch",
-      "el_GR": "Griechisch",
-      "lv_LV": "Lettisch"
-    }
+        "locales": {
+            "de_DE": "Deutsch",
+            "fr_FR": "Français",
+            "zh_CN": "简体中文",
+            "zh_TW": "繁體中文",
+            "en_US": "English",
+            "it_IT": "Italiano",
+            "ko_KR": "한글",
+            "ru_RU": "Русский",
+            "es_ES": "Español",
+            "ja_JA": "日本語",
+            "tr_TR": "Türkçe",
+            "fa_IR": "فارسي",
+            "uk_UA": "Українська",
+            "cs_CZ": "Česky",
+            "el_GR": "Ελληνικά",
+            "ro_RO": "Română",
+            "lv_LV": "Latviešu"
+        }
   }
 }
diff --git a/ui/src/app/locale/locale.constant-el_GR.json b/ui/src/app/locale/locale.constant-el_GR.json
index 9b9783a9ad..a8ec2520fa 100644
--- a/ui/src/app/locale/locale.constant-el_GR.json
+++ b/ui/src/app/locale/locale.constant-el_GR.json
@@ -2601,23 +2601,24 @@
     }
   },
   "language": {
-    "language": "Γλώσσα",
-    "locales": {
-      "de_DE": "Γερμανικά",
-      "fr_FR": "Γαλλικά",
-      "zh_CN": "Κινέζικα",
-      "en_US": "Αγγλικά",
-      "it_IT": "Ιταλικά",
-      "ko_KR": "Κορεάτικα",
-      "ru_RU": "Ρώσικα",
-      "es_ES": "Ισπανικά",
-      "ja_JA": "Ιαπωνικά",
-      "tr_TR": "Τούρκικα",
-      "fa_IR": "Περσικά",
-      "uk_UA": "Ουκρανικά",
-      "cs_CZ": "Τσέχικα",
-	  "el_GR": "Ελληνικά",
-      "lv_LV": "Λετονικά"
-    }
+        "locales": {
+            "de_DE": "Deutsch",
+            "fr_FR": "Français",
+            "zh_CN": "简体中文",
+            "zh_TW": "繁體中文",
+            "en_US": "English",
+            "it_IT": "Italiano",
+            "ko_KR": "한글",
+            "ru_RU": "Русский",
+            "es_ES": "Español",
+            "ja_JA": "日本語",
+            "tr_TR": "Türkçe",
+            "fa_IR": "فارسي",
+            "uk_UA": "Українська",
+            "cs_CZ": "Česky",
+            "el_GR": "Ελληνικά",
+            "ro_RO": "Română",
+            "lv_LV": "Latviešu"
+        }
   }
 }
diff --git a/ui/src/app/locale/locale.constant-en_US.json b/ui/src/app/locale/locale.constant-en_US.json
index 5acd0f81e5..68899394ff 100644
--- a/ui/src/app/locale/locale.constant-en_US.json
+++ b/ui/src/app/locale/locale.constant-en_US.json
@@ -50,8 +50,7 @@
         "export": "Export",
         "share-via": "Share via {{provider}}",
         "continue": "Continue",
-        "discard-changes": "Discard Changes",
-        "download": "Download"
+        "discard-changes": "Discard Changes"
     },
     "aggregation": {
         "aggregation": "Aggregation",
@@ -1125,58 +1124,6 @@
     "function": {
         "function": "Function"
     },
-    "gateway": {
-        "key": "Key configuration",
-        "value": "Value configuration",
-        "remove-entry": "Remove configuration",
-        "add-entry": "Add configuration",
-        "no-data": "No configurations",
-        "gateway-required": "Gateway is required.",
-        "gateway-name": "Gateway name",
-        "create-new-gateway": "Create a new gateway",
-        "create-new-gateway-text": "Are you sure you want create a new gateway with name: '{{gatewayName}}'?",
-        "no-gateway-matching": " '{{item}}' not found.",
-        "thingsboard": "ThingsBoard",
-        "connectors": "Connectors configuration",
-        "thingsboard-host": "ThingsBoard Host",
-        "thingsboard-port": "ThingsBoard Port",
-        "security-type": "Security type",
-        "tls-path-ca-certificate": "Path to CA certificate on gateway:",
-        "tls-path-private-key": "Path to private key on gateway:",
-        "tls-path-client-certificate": "Path to client certificate on gateway:",
-        "storage": "Storage",
-        "storage-type": "Storage type",
-        "storage-read-time": "Read records per time:",
-        "storage-max-time": "Maximum records per time:",
-        "storage-max-files": "Maximum files:",
-        "storage-data-path": "Data folder path:",
-        "download-tip": "Download configuration file",
-        "save-tip": "Save configuration file",
-        "remote-tip": "Allow remote configuration",
-        "remote": "Remote configuration",
-        "remote-logging-level": "Logging level",
-        "remote-logging-path-logs": "Path to logs",
-        "connector-type": "Connector type",
-        "update-config": "Add/update config JSON",
-        "delete": "Delete configuration",
-        "title-connectors-json": "Connector {{typeName}} configuration",
-        "json-required": "Config json is required for gateway config.",
-        "json-parse": "Unable to parse config json for gateway config.",
-        "tidy": "Tidy",
-        "tidy-tip": "Tidy config JSON",
-        "transformer-json-config": "JSON for the config*",
-        "toggle-fullscreen": "Toggle fullscreen",
-        "add-connectors": "Add new connectors",
-        "no-connectors": "No connectors",
-        "enabled": "Enabled",
-        "name": "Name",
-        "no-gateway-found": "No gateway found.",
-        "gateway": "Gateway",
-        "keyval-save-err": "Save config error",
-        "keyval-name-err": "Please add <b>Name</b>",
-        "keyval-type-err": "Please add <b>Connector type</b>",
-        "keyval-config-err": "Please add <b>configuration JSON</b>"
-    },
     "grid": {
         "delete-item-title": "Are you sure you want to delete this item?",
         "delete-item-text": "Be careful, after the confirmation this item and all related data will become unrecoverable.",
@@ -1844,23 +1791,25 @@
     },
     "language": {
         "language": "Language",
-        "locales": {
-            "de_DE": "German",
-            "fr_FR": "French",
-            "zh_CN": "Simplified Chinese",
-            "zh_TW": "Traditional Chinese",
+         "locales": {
+            "de_DE": "Deutsch",
+            "fr_FR": "Français",
+            "zh_CN": "简体中文",
+            "zh_TW": "繁體中文",
             "en_US": "English",
-            "it_IT": "Italian",
-            "ko_KR": "Korean",
-            "ru_RU": "Russian",
-            "es_ES": "Spanish",
-            "ja_JA": "Japanese",
-            "tr_TR": "Turkish",
-            "fa_IR": "Persian",
-            "uk_UA": "Ukrainian",
-            "cs_CZ": "Czech",
-            "el_GR": "Greek",
-            "lv_LV": "Latvian"
+            "it_IT": "Italiano",
+            "ko_KR": "한글",
+            "ru_RU": "Русский",
+            "es_ES": "Español",
+            "ja_JA": "日本語",
+            "tr_TR": "Türkçe",
+            "fa_IR": "فارسي",
+            "uk_UA": "Українська",
+            "cs_CZ": "Česky",
+            "el_GR": "Ελληνικά",
+            "ro_RO": "Română",
+            "lv_LV": "Latviešu"
+            
         }
     }
 }
diff --git a/ui/src/app/locale/locale.constant-es_ES.json b/ui/src/app/locale/locale.constant-es_ES.json
index 75abc889b3..8dcf6767e5 100644
--- a/ui/src/app/locale/locale.constant-es_ES.json
+++ b/ui/src/app/locale/locale.constant-es_ES.json
@@ -1761,21 +1761,23 @@
     "language": {
         "language": "Lenguaje",
         "locales": {
-            "de_DE": "Alemán",
-            "fr_FR": "Francés",
-            "zh_CN": "Chino",
-            "en_US": "Inglés",
+            "de_DE": "Deutsch",
+            "fr_FR": "Français",
+            "zh_CN": "简体中文",
+            "zh_TW": "繁體中文",
+            "en_US": "English",
             "it_IT": "Italiano",
-            "ko_KR": "Coreano",
-            "ru_RU": "Ruso",
+            "ko_KR": "한글",
+            "ru_RU": "Русский",
             "es_ES": "Español",
-            "ja_JA": "Japonés",
-            "tr_TR": "Turco",
-            "fa_IR": "Persa",
-            "uk_UA": "Ucraniano",
-            "cs_CZ": "Checo",
-            "el_GR": "Griego",
-            "lv_LV": "Letón"
+            "ja_JA": "日本語",
+            "tr_TR": "Türkçe",
+            "fa_IR": "فارسي",
+            "uk_UA": "Українська",
+            "cs_CZ": "Česky",
+            "el_GR": "Ελληνικά",
+            "ro_RO": "Română",
+            "lv_LV": "Latviešu"
         }
     }
 }
diff --git a/ui/src/app/locale/locale.constant-fa_IR.json b/ui/src/app/locale/locale.constant-fa_IR.json
index 34eee792b9..960796b063 100644
--- a/ui/src/app/locale/locale.constant-fa_IR.json
+++ b/ui/src/app/locale/locale.constant-fa_IR.json
@@ -1626,19 +1626,23 @@
     "language": {
         "language": "زبان",
         "locales": {
-            "de_DE": "آلمانی",
-			"fr_FR": "فرانسوي",
-            "zh_CN": "چيني",
-            "en_US": "انگليسي",
-            "it_IT": "ايتاليايي",
-            "ko_KR": "کره اي",
-            "ru_RU": "روسي",
-            "es_ES": "اسپانيولي",
-            "ja_JA": "ژاپني",
-            "tr_TR": "ترکي",
-			"fa_IR": "فارسي",
-            "uk_UA": "اوکراین",
-	          "cs_CZ": "در چک "            
+            "de_DE": "Deutsch",
+            "fr_FR": "Français",
+            "zh_CN": "简体中文",
+            "zh_TW": "繁體中文",
+            "en_US": "English",
+            "it_IT": "Italiano",
+            "ko_KR": "한글",
+            "ru_RU": "Русский",
+            "es_ES": "Español",
+            "ja_JA": "日本語",
+            "tr_TR": "Türkçe",
+            "fa_IR": "فارسي",
+            "uk_UA": "Українська",
+            "cs_CZ": "Česky",
+            "el_GR": "Ελληνικά",
+            "ro_RO": "Română",
+            "lv_LV": "Latviešu"
         }
     }
 }
diff --git a/ui/src/app/locale/locale.constant-fr_FR.json b/ui/src/app/locale/locale.constant-fr_FR.json
index f234afbd88..8509b1b054 100644
--- a/ui/src/app/locale/locale.constant-fr_FR.json
+++ b/ui/src/app/locale/locale.constant-fr_FR.json
@@ -1169,23 +1169,25 @@
         "value": "Valeur"
     },
     "language": {
-        "language": "Language",
+        "language": "Langue",
         "locales": {
-            "de_DE": "Allemand",
-            "en_US": "Anglais",
+            "de_DE": "Deutsch",
             "fr_FR": "Français",
-            "es_ES": "Espagnol",
-            "it_IT": "Italien",
-            "ko_KR": "Coréen",
-            "ru_RU": "Russe",
-            "zh_CN": "Chinois",
-            "ja_JA": "Japonaise",
-            "tr_TR": "Turc",
-            "fa_IR": "Persane",
-            "uk_UA": "Ukrainien",
-            "cs_CZ": "Tchèque",
-            "el_GR": "Grec",
-            "lv_LV": "Letton"
+            "zh_CN": "简体中文",
+            "zh_TW": "繁體中文",
+            "en_US": "English",
+            "it_IT": "Italiano",
+            "ko_KR": "한글",
+            "ru_RU": "Русский",
+            "es_ES": "Español",
+            "ja_JA": "日本語",
+            "tr_TR": "Türkçe",
+            "fa_IR": "فارسي",
+            "uk_UA": "Українська",
+            "cs_CZ": "Česky",
+            "el_GR": "Ελληνικά",
+            "ro_RO": "Română",
+            "lv_LV": "Latviešu"
         }
     },
     "layout": {
diff --git a/ui/src/app/locale/locale.constant-it_IT.json b/ui/src/app/locale/locale.constant-it_IT.json
index 1c65d04096..ecb721d782 100644
--- a/ui/src/app/locale/locale.constant-it_IT.json
+++ b/ui/src/app/locale/locale.constant-it_IT.json
@@ -1702,21 +1702,23 @@
     "language": {
         "language": "Lingua",
         "locales": {
-            "de_DE": "Tedesco",
-            "fr_FR": "Francese",
-            "zh_CN": "Cinese",
-            "en_US": "Inglese",
+            "de_DE": "Deutsch",
+            "fr_FR": "Français",
+            "zh_CN": "简体中文",
+            "zh_TW": "繁體中文",
+            "en_US": "English",
             "it_IT": "Italiano",
-            "ko_KR": "Coreano",
-            "ru_RU": "Russo",
-            "es_ES": "Spagnolo",
-            "ja_JA": "Giapponese",
-            "tr_TR": "Turco",
-            "fa_IR": "Persiana",
-            "uk_UA": "Ucraino",
-            "cs_CZ": "Ceco",
-            "el_GR": "Greco",
-            "lv_LV": "lettone"
+            "ko_KR": "한글",
+            "ru_RU": "Русский",
+            "es_ES": "Español",
+            "ja_JA": "日本語",
+            "tr_TR": "Türkçe",
+            "fa_IR": "فارسي",
+            "uk_UA": "Українська",
+            "cs_CZ": "Česky",
+            "el_GR": "Ελληνικά",
+            "ro_RO": "Română",
+            "lv_LV": "Latviešu"
         }
     }
 }
diff --git a/ui/src/app/locale/locale.constant-ja_JA.json b/ui/src/app/locale/locale.constant-ja_JA.json
index e1ebd4d6b3..a2560e78b1 100644
--- a/ui/src/app/locale/locale.constant-ja_JA.json
+++ b/ui/src/app/locale/locale.constant-ja_JA.json
@@ -1509,20 +1509,24 @@
 	},
 	"language": {
 		"language": "言語",
-		"locales": {
-			"de_DE": "ドイツ語",
-            "fr_FR": "フランス語",
-			"en_US": "英語",
-			"ko_KR": "韓国語",
-			"it_IT": "イタリアの",
-			"zh_CN": "中国語",
-			"ru_RU": "ロシア",
-			"es_ES": "スペイン語",
-			"ja_JA": "日本語",
-			"tr_TR": "トルコ語",
-            "fa_IR": "ペルシャ語",
-            "uk_UA": "ウクライナ語",
-			"cs_CZ": "チェコ語で"            
-		}
+        "locales": {
+            "de_DE": "Deutsch",
+            "fr_FR": "Français",
+            "zh_CN": "简体中文",
+            "zh_TW": "繁體中文",
+            "en_US": "English",
+            "it_IT": "Italiano",
+            "ko_KR": "한글",
+            "ru_RU": "Русский",
+            "es_ES": "Español",
+            "ja_JA": "日本語",
+            "tr_TR": "Türkçe",
+            "fa_IR": "فارسي",
+            "uk_UA": "Українська",
+            "cs_CZ": "Česky",
+            "el_GR": "Ελληνικά",
+            "ro_RO": "Română",
+            "lv_LV": "Latviešu"
+        }
 	}
-}
\ No newline at end of file
+}
diff --git a/ui/src/app/locale/locale.constant-ko_KR.json b/ui/src/app/locale/locale.constant-ko_KR.json
index fde60c77bb..9e6a2043c0 100644
--- a/ui/src/app/locale/locale.constant-ko_KR.json
+++ b/ui/src/app/locale/locale.constant-ko_KR.json
@@ -1385,19 +1385,23 @@
     "language": {
         "language": "언어",
         "locales": {
-            "de_DE": "독일어",
-            "en_US": "영어",
-            "fr_FR": "프랑스의",
+            "de_DE": "Deutsch",
+            "fr_FR": "Français",
+            "zh_CN": "简体中文",
+            "zh_TW": "繁體中文",
+            "en_US": "English",
+            "it_IT": "Italiano",
             "ko_KR": "한글",
-            "zh_CN": "중국어",
-            "ru_RU": "러시아어",
-            "es_ES": "스페인어",
-            "it_IT": "이탈리아 사람",
-            "ja_JA": "일본어",
-            "tr_TR": "터키어",
-            "fa_IR": "페르시아 인",
-            "uk_UA": "우크라이나의",
-            "cs_CZ": "체코 어로"            
+            "ru_RU": "Русский",
+            "es_ES": "Español",
+            "ja_JA": "日本語",
+            "tr_TR": "Türkçe",
+            "fa_IR": "فارسي",
+            "uk_UA": "Українська",
+            "cs_CZ": "Česky",
+            "el_GR": "Ελληνικά",
+            "ro_RO": "Română",
+            "lv_LV": "Latviešu"
         }
     }
-}
\ No newline at end of file
+}
diff --git a/ui/src/app/locale/locale.constant-lv_LV.json b/ui/src/app/locale/locale.constant-lv_LV.json
index 4ddbb1856f..7221d6c62e 100644
--- a/ui/src/app/locale/locale.constant-lv_LV.json
+++ b/ui/src/app/locale/locale.constant-lv_LV.json
@@ -1679,19 +1679,23 @@
     "language": {
         "language": "Language",
         "locales": {
-            "de_DE": "German",
-            "fr_FR": "French",
-            "zh_CN": "Simplified Chinese",
+            "de_DE": "Deutsch",
+            "fr_FR": "Français",
+            "zh_CN": "简体中文",
+            "zh_TW": "繁體中文",
             "en_US": "English",
-            "it_IT": "Italian",
-            "ko_KR": "Korean",
-            "ru_RU": "Russian",
-            "es_ES": "Spanish",
-            "ja_JA": "Japanese",
-            "tr_TR": "Turkish",
-            "fa_IR": "Persian",
-            "uk_UA": "Ukrainian",
-            "cs_CZ": "Czech"
+            "it_IT": "Italiano",
+            "ko_KR": "한글",
+            "ru_RU": "Русский",
+            "es_ES": "Español",
+            "ja_JA": "日本語",
+            "tr_TR": "Türkçe",
+            "fa_IR": "فارسي",
+            "uk_UA": "Українська",
+            "cs_CZ": "Česky",
+            "el_GR": "Ελληνικά",
+            "ro_RO": "Română",
+            "lv_LV": "Latviešu"
         }
     }
-}
\ No newline at end of file
+}
diff --git a/ui/src/app/locale/locale.constant-ru_RU.json b/ui/src/app/locale/locale.constant-ru_RU.json
index 87075014ba..ea2b073f85 100644
--- a/ui/src/app/locale/locale.constant-ru_RU.json
+++ b/ui/src/app/locale/locale.constant-ru_RU.json
@@ -1788,21 +1788,23 @@
     "language": {
         "language": "Язык",
         "locales": {
-            "de_DE": "Немецкий",
-            "en_US": "Английский",
-            "zh_CN": "Китайский",
-            "ko_KR": "Корейский",
-            "es_ES": "Испанский",
-            "it_IT": "Итальянский",
+            "de_DE": "Deutsch",
+            "fr_FR": "Français",
+            "zh_CN": "简体中文",
+            "zh_TW": "繁體中文",
+            "en_US": "English",
+            "it_IT": "Italiano",
+            "ko_KR": "한글",
             "ru_RU": "Русский",
-            "tr_TR": "Турецкий",
-            "fr_FR": "Французский",
-            "ja_JA": "Японский",
-            "fa_IR": "Персидский",
-            "uk_UA": "Украинский",
-            "cs_CZ": "Чешский",
-            "el_GR": "Греческий",
-            "lv_LV": "Латышский"
+            "es_ES": "Español",
+            "ja_JA": "日本語",
+            "tr_TR": "Türkçe",
+            "fa_IR": "فارسي",
+            "uk_UA": "Українська",
+            "cs_CZ": "Česky",
+            "el_GR": "Ελληνικά",
+            "ro_RO": "Română",
+            "lv_LV": "Latviešu"
         }
     }
 }
diff --git a/ui/src/app/locale/locale.constant-tr_TR.json b/ui/src/app/locale/locale.constant-tr_TR.json
index c9c5964c52..111a8d3ef3 100644
--- a/ui/src/app/locale/locale.constant-tr_TR.json
+++ b/ui/src/app/locale/locale.constant-tr_TR.json
@@ -1592,21 +1592,23 @@
     "language": {
         "language": "Dil",
         "locales": {
-            "de_DE": "Almanca",
-            "fr_FR": "Fransızca",
-            "zh_CN": "Çince",
-            "en_US": "İngilizce",
-            "it_IT": "İtalyan",
-            "ko_KR": "Koreli",
-            "ru_RU": "Rusça",
-            "es_ES": "İspanyol",
-            "ja_JA": "Japonca",
+            "de_DE": "Deutsch",
+            "fr_FR": "Français",
+            "zh_CN": "简体中文",
+            "zh_TW": "繁體中文",
+            "en_US": "English",
+            "it_IT": "Italiano",
+            "ko_KR": "한글",
+            "ru_RU": "Русский",
+            "es_ES": "Español",
+            "ja_JA": "日本語",
             "tr_TR": "Türkçe",
-            "fa_IR": "Farsça",
-            "uk_UA": "Ukrayna",
-            "cs_CZ": "Çekçe",
-            "el_GR": "Yunanca",
-            "lv_LV": "Letonca"
+            "fa_IR": "فارسي",
+            "uk_UA": "Українська",
+            "cs_CZ": "Česky",
+            "el_GR": "Ελληνικά",
+            "ro_RO": "Română",
+            "lv_LV": "Latviešu"
         }
     }
-}
\ No newline at end of file
+}
diff --git a/ui/src/app/locale/locale.constant-uk_UA.json b/ui/src/app/locale/locale.constant-uk_UA.json
index 6aa1e06e89..e22cfe6097 100644
--- a/ui/src/app/locale/locale.constant-uk_UA.json
+++ b/ui/src/app/locale/locale.constant-uk_UA.json
@@ -2394,21 +2394,23 @@
     "language": {
         "language": "Мова",
         "locales": {
-            "fr_FR": "Французька",
-            "zh_CN": "Китайська",
-            "en_US": "Англійська",
-            "it_IT": "Італійська",
-            "ko_KR": "Корейська",
-            "ru_RU": "Російська",
-            "es_ES": "Іспанська",
-            "ja_JA": "Японська",
-            "tr_TR": "Турецька",
-            "de_DE": "Німецька",
+            "de_DE": "Deutsch",
+            "fr_FR": "Français",
+            "zh_CN": "简体中文",
+            "zh_TW": "繁體中文",
+            "en_US": "English",
+            "it_IT": "Italiano",
+            "ko_KR": "한글",
+            "ru_RU": "Русский",
+            "es_ES": "Español",
+            "ja_JA": "日本語",
+            "tr_TR": "Türkçe",
+            "fa_IR": "فارسي",
             "uk_UA": "Українська",
-            "fa_IR": "Перська",
-            "cs_CZ": "Чеська",
-            "el_GR": "Грецька",
-            "lv_LV": "Латиська"
+            "cs_CZ": "Česky",
+            "el_GR": "Ελληνικά",
+            "ro_RO": "Română",
+            "lv_LV": "Latviešu"
         }
     }
 }
diff --git a/ui/src/app/locale/locale.constant-zh_CN.json b/ui/src/app/locale/locale.constant-zh_CN.json
index 0c1f5f743b..bb071f0220 100644
--- a/ui/src/app/locale/locale.constant-zh_CN.json
+++ b/ui/src/app/locale/locale.constant-zh_CN.json
@@ -1603,20 +1603,23 @@
     "language": {
         "language": "语言",
         "locales": {
-            "de_DE": "德文",
-            "en_US": "英文",
-            "fr_FR": "法文",
-            "ko_KR": "韩文",
+            "de_DE": "Deutsch",
+            "fr_FR": "Français",
             "zh_CN": "简体中文",
-            "zh_TW": "繁体中文",
-            "ru_RU": "俄文",
-            "es_ES": "西班牙文",
-            "it_IT": "意大利文",
-            "ja_JA": "日文",
-            "tr_TR": "土耳其文",
-            "fa_IR": "波斯文",
-            "uk_UA": "乌克兰文",
-            "cs_CZ": "捷克文"            
+            "zh_TW": "繁體中文",
+            "en_US": "English",
+            "it_IT": "Italiano",
+            "ko_KR": "한글",
+            "ru_RU": "Русский",
+            "es_ES": "Español",
+            "ja_JA": "日本語",
+            "tr_TR": "Türkçe",
+            "fa_IR": "فارسي",
+            "uk_UA": "Українська",
+            "cs_CZ": "Česky",
+            "el_GR": "Ελληνικά",
+            "ro_RO": "Română",
+            "lv_LV": "Latviešu"
         }
     }
 }
diff --git a/ui/src/app/locale/locale.constant-zh_TW.json b/ui/src/app/locale/locale.constant-zh_TW.json
index acaa9ac53c..aa38940a4e 100644
--- a/ui/src/app/locale/locale.constant-zh_TW.json
+++ b/ui/src/app/locale/locale.constant-zh_TW.json
@@ -1602,21 +1602,24 @@
     },
     "language": {
         "language": "語言",
-        "locales": {
-            "de_DE": "德文",
-            "en_US": "英文",
-            "fr_FR": "法文",
-            "ko_KR": "韓文",
-            "zh_CN": "簡體中文",
-            "zh_TW": "繁體中文",
-            "ru_RU": "俄文",
-            "es_ES": "西班牙文",
-            "it_IT": "意大利文",
-            "ja_JA": "日文",
-            "tr_TR": "土耳其文",
-            "fa_IR": "波斯文",
-            "uk_UA": "烏克蘭文",
-            "cs_CZ": "捷克文"
-        }
+        "locales": {
+            "de_DE": "Deutsch",
+            "fr_FR": "Français",
+            "zh_CN": "简体中文",
+            "zh_TW": "繁體中文",
+            "en_US": "English",
+            "it_IT": "Italiano",
+            "ko_KR": "한글",
+            "ru_RU": "Русский",
+            "es_ES": "Español",
+            "ja_JA": "日本語",
+            "tr_TR": "Türkçe",
+            "fa_IR": "فارسي",
+            "uk_UA": "Українська",
+            "cs_CZ": "Česky",
+            "el_GR": "Ελληνικά",
+            "ro_RO": "Română",
+            "lv_LV": "Latviešu"
+        }
     }
 }