diff --git a/tasmota/language/af_AF.h b/tasmota/language/af_AF.h
index a3e96d155..3e190d36b 100644
--- a/tasmota/language/af_AF.h
+++ b/tasmota/language/af_AF.h
@@ -60,8 +60,8 @@
 #define D_AT "at"
 #define D_AUTO "AUTO"
 #define D_AUTO_UPDATE "Auto Update"
-#define D_BATTERY "Battery"
 #define D_BATT "Batt"                // Short for Battery
+#define D_BATTERY "Battery"
 #define D_BATTERY_CHARGE "Lading"    // Battery charge in %
 #define D_BLINK "Flits"
 #define D_BLINKOFF "FlitsAf"
@@ -76,17 +76,17 @@
 #define D_CO2 "Koolstofdioksied"
 #define D_CODE "kode"                // Button code
 #define D_COLDLIGHT "Koud"
+#define D_COLOR "Color"
 #define D_COMMAND "Bevel"
 #define D_CONNECTED "Gekoppel"
 #define D_CORS_DOMAIN "CORS Domain"
-#define D_COLOR "Color"
 #define D_COUNT "Telling"
 #define D_COUNTER "Opnemer"
 #define D_CT_POWER "CT Power"
 #define D_CURRENT "Stroom"          // As in Voltage and Current
 #define D_CURRENT_NEUTRAL "Current Neutral"
-#define D_DATA "Data"
 #define D_DARKLIGHT "Donker"
+#define D_DATA "Data"
 #define D_DEBUG "Ontfout"
 #define D_DEWPOINT "Dou punt"
 #define D_DISABLED "Gedeaktiveer"
@@ -113,15 +113,13 @@
 #define D_FRAGMENTATION "frag."      // Lower case abbreviated version of fragmentation used in "memory fragmentation"
 #define D_FRAME_RATE "Frame rate"
 #define D_FREE_MEMORY "Vrye geheue"
-#define D_PSR_MAX_MEMORY "PS-RAM geheue"
-#define D_PSR_FREE_MEMORY "PS-RAM vrye geheue"
 #define D_FREQUENCY "Frekwensie"
 #define D_GAS "Gas"
 #define D_GATEWAY "Gateway"
 #define D_GROUP "Groep"
-#define D_HOST "Gasheer"
 #define D_HALL_EFFECT "Hall Effect"
 #define D_HEATINDEX "Heat index"
+#define D_HOST "Gasheer"
 #define D_HOSTNAME "Gasheername"
 #define D_HUMIDITY "Humiditeit"
 #define D_ILLUMINANCE "Verligting"
@@ -132,10 +130,11 @@
 #define D_INITIALIZED "Geïnisialiseer"
 #define D_IP_ADDRESS "IP-adresse"
 #define D_LIGHT "Lig"
-#define D_LWT "LWT"
 #define D_LQI "LQI"                  // Zigbee Link Quality Index
+#define D_LWT "LWT"
 #define D_MODULE "Module"
 #define D_MOISTURE "Vog"
+#define D_MQ "MQ"
 #define D_MQTT "MQTT"
 #define D_MULTI_PRESS "multi-press"
 #define D_NOISE "Geraas"
@@ -148,10 +147,9 @@
 #define D_ON "aan"
 #define D_ONLINE "Aanlyn"
 #define D_ORP "ORP"
+#define D_PARTITION "Partition"      // As in flash and firmware partition
 #define D_PASSWORD "Wagwoord"
 #define D_PH "pH"
-#define D_MQ "MQ"
-#define D_PARTITION "Partition"      // As in flash and firmware partition
 #define D_PORT "Poort"
 #define D_POWER_FACTOR "Krag faktor"
 #define D_POWERUSAGE "Krag"
@@ -164,27 +162,31 @@
 #define D_PROGRAM_FLASH_SIZE "Program Flash Grootte"
 #define D_PROGRAM_SIZE "Program Grootte"
 #define D_PROJECT "Projek"
+#define D_PSR_FREE_MEMORY "PS-RAM vrye geheue"
+#define D_PSR_MAX_MEMORY "PS-RAM geheue"
 #define D_RAIN "Reën"
 #define D_RANGE "Gebied"
 #define D_RECEIVED "Ontvang"
 #define D_RESTART "Herbegin"
-#define D_RESTARTING "Herbegin"
 #define D_RESTART_REASON "Herlaai rede"
+#define D_RESTARTING "Herbegin"
 #define D_RETAINED "behou"
 #define D_RULE "Reël"
 #define D_SAVE "Stoor"
 #define D_SENSOR "Sensor"
+#define D_SOC "Laai kondisie"
+#define D_SOH "Laai vermoeë"
 #define D_SSID "SSId"
 #define D_START "Begin"
 #define D_STD_TIME "STD"
 #define D_STOP "Stop"
 #define D_SUBNET_MASK "Subnet Masker"
 #define D_SUBSCRIBE_TO "Teken in op"
-#define D_UNSUBSCRIBE_FROM "Teken uit van"
 #define D_SUCCESSFUL "Suksesvol"
 #define D_SUNRISE "Sonsopkoms"
 #define D_SUNSET "Sononder"
 #define D_TEMPERATURE "Temperatuur"
+#define D_TIME_OF_DAY "Tyd"
 #define D_TO "naar"
 #define D_TOGGLE "Verwissel"
 #define D_TOPIC "Onderwerp"
@@ -195,6 +197,7 @@
 #define D_TWILIGHT_ASTRONOMICAL "Astronomical"
 #define D_TWILIGHT_CIVIL "Civil"
 #define D_TWILIGHT_NAUTICAL "Nautical"
+#define D_UNSUBSCRIBE_FROM "Teken uit van"
 #define D_UPLOAD "Laai op"
 #define D_UPTIME "Uptyd"
 #define D_USED "used"
@@ -214,12 +217,10 @@
 #define D_VOC "VOC"
 #define D_VOLTAGE "Spanning"
 #define D_VOLUME "Volume"
-#define D_WEIGHT "Gewig"
 #define D_WARMLIGHT "Warm"
-#define D_WEB_SERVER "Webbediener"
-#define D_SOC "Laai kondisie"
-#define D_SOH "Laai vermoeë"
 #define D_WATER_DEPTH "Water diepte"
+#define D_WEB_SERVER "Webbediener"
+#define D_WEIGHT "Gewig"
 
 // tasmota.ino
 #define D_WARNING_MINIMAL_VERSION "WAARSKUWING Hierdie weergawe ondersteun nie aanhoudende instellings nie"
@@ -474,7 +475,6 @@
 #define D_TIMER_PARAMETERS "Timer-parameters"
 #define D_TIMER_ENABLE "Aktiveer timers"
 #define D_TIMER_ARM "Aktiveer"
-#define D_TIMER_TIME "Tyd"
 #define D_TIMER_DAYS "Dae"
 #define D_TIMER_REPEAT "Herhaal"
 #define D_TIMER_OUTPUT "Uitset"
diff --git a/tasmota/language/bg_BG.h b/tasmota/language/bg_BG.h
index cd4ecaabc..751dfd7f1 100644
--- a/tasmota/language/bg_BG.h
+++ b/tasmota/language/bg_BG.h
@@ -60,8 +60,8 @@
 #define D_AT "at"
 #define D_AUTO "АВТОМАТИЧНО"
 #define D_AUTO_UPDATE "Auto Update"
-#define D_BATTERY "Battery"
 #define D_BATT "Бат."                // Short for Battery
+#define D_BATTERY "Battery"
 #define D_BATTERY_CHARGE "Charge"   // Battery charge in %
 #define D_BLINK "Мигане вкл."
 #define D_BLINKOFF "Мигане изкл."
@@ -76,17 +76,17 @@
 #define D_CO2 "Въглероден диоксид"
 #define D_CODE "код"                 // Button code
 #define D_COLDLIGHT "Студена"
+#define D_COLOR "Color"
 #define D_COMMAND "Команда"
 #define D_CONNECTED "Свързан"
 #define D_CORS_DOMAIN "Домейн на CORS"
-#define D_COLOR "Color"
 #define D_COUNT "Брой"
 #define D_COUNTER "Брояч"
 #define D_CT_POWER "ТТ Мощност"
 #define D_CURRENT "Ток"              // As in Voltage and Current
 #define D_CURRENT_NEUTRAL "Ток по нулата"
-#define D_DATA "Данни"
 #define D_DARKLIGHT "Тъмна"
+#define D_DATA "Данни"
 #define D_DEBUG "Премахване на дефекти"
 #define D_DEWPOINT "Температура на оросяване"
 #define D_DISABLED "Забранено"
@@ -113,15 +113,13 @@
 #define D_FRAGMENTATION "фраг."      // Lower case abbreviated version of fragmentation used in "memory fragmentation"
 #define D_FRAME_RATE "Кадъра в секунда"
 #define D_FREE_MEMORY "Свободна памет"
-#define D_PSR_MAX_MEMORY "PS-RAM Memory"
-#define D_PSR_FREE_MEMORY "PS-RAM free Memory"
 #define D_FREQUENCY "Честота"
 #define D_GAS "Газ"
 #define D_GATEWAY "Шлюз"
 #define D_GROUP "Група"
-#define D_HOST "Хост"
 #define D_HALL_EFFECT "Ефект на Хол"
 #define D_HEATINDEX "Heat index"
+#define D_HOST "Хост"
 #define D_HOSTNAME "Име на хоста"
 #define D_HUMIDITY "Влажност"
 #define D_ILLUMINANCE "Осветеност"
@@ -132,10 +130,11 @@
 #define D_INITIALIZED "Инициализирано"
 #define D_IP_ADDRESS "Адрес по IP"
 #define D_LIGHT "Светлина"
-#define D_LWT "LWT"
 #define D_LQI "LQI"                  // Zigbee Link Quality Index
+#define D_LWT "LWT"
 #define D_MODULE "Модул"
 #define D_MOISTURE "Влага"
+#define D_MQ "MQ"
 #define D_MQTT "MQTT"
 #define D_MULTI_PRESS "неколкократно натискане"
 #define D_NOISE "Шум"
@@ -148,10 +147,9 @@
 #define D_ON "Вкл."
 #define D_ONLINE "Онлайн"
 #define D_ORP "ORP"
+#define D_PARTITION "Дял"      // As in flash and firmware partition
 #define D_PASSWORD "Парола"
 #define D_PH "pH"
-#define D_MQ "MQ"
-#define D_PARTITION "Дял"      // As in flash and firmware partition
 #define D_PORT "Порт"
 #define D_POWER_FACTOR "Фактор на мощността"
 #define D_POWERUSAGE "Мощност"
@@ -164,27 +162,31 @@
 #define D_PROGRAM_FLASH_SIZE "Размер на флаш-памет за програми"
 #define D_PROGRAM_SIZE "Размер на програмата"
 #define D_PROJECT "Проект"
+#define D_PSR_FREE_MEMORY "PS-RAM free Memory"
+#define D_PSR_MAX_MEMORY "PS-RAM Memory"
 #define D_RAIN "Дъжд"
 #define D_RANGE "Обхват"
 #define D_RECEIVED "Получено"
 #define D_RESTART "Рестартиране"
-#define D_RESTARTING "Рестартиране"
 #define D_RESTART_REASON "Причина за рестарт"
+#define D_RESTARTING "Рестартиране"
 #define D_RETAINED "запазено"
 #define D_RULE "Правило"
 #define D_SAVE "Запазване"
 #define D_SENSOR "Датчик"
+#define D_SOC "Съснояние на зареждане"
+#define D_SOH "State of Health"
 #define D_SSID "SSId"
 #define D_START "Стартиране"
 #define D_STD_TIME "STD"
 #define D_STOP "Спиране"
 #define D_SUBNET_MASK "Мрежова маска"
 #define D_SUBSCRIBE_TO "Абониране за"
-#define D_UNSUBSCRIBE_FROM "Отписване от"
 #define D_SUCCESSFUL "Успешно"
 #define D_SUNRISE "Изгрев"
 #define D_SUNSET "Залез"
 #define D_TEMPERATURE "Температура"
+#define D_TIME_OF_DAY "Време"
 #define D_TO "към"
 #define D_TOGGLE "Превключване"
 #define D_TOPIC "Тема"
@@ -195,6 +197,7 @@
 #define D_TWILIGHT_ASTRONOMICAL "Astronomical"
 #define D_TWILIGHT_CIVIL "Civil"
 #define D_TWILIGHT_NAUTICAL "Nautical"
+#define D_UNSUBSCRIBE_FROM "Отписване от"
 #define D_UPLOAD "Качването е"
 #define D_UPTIME "Време на работа"
 #define D_USED "използвано"
@@ -214,12 +217,10 @@
 #define D_VOC "VOC"
 #define D_VOLTAGE "Напрежение"
 #define D_VOLUME "Обем"
-#define D_WEIGHT "Тегло"
 #define D_WARMLIGHT "Топла"
-#define D_WEB_SERVER "Уеб сървър"
-#define D_SOC "Съснояние на зареждане"
-#define D_SOH "State of Health"
 #define D_WATER_DEPTH "Дълбочина на водата"
+#define D_WEB_SERVER "Уеб сървър"
+#define D_WEIGHT "Тегло"
 
 // tasmota.ino
 #define D_WARNING_MINIMAL_VERSION "ПРЕДУПРЕЖДЕНИЕ Тази версия не поддържа постоянни настройки"
@@ -474,7 +475,6 @@
 #define D_TIMER_PARAMETERS "Параметри на графиците"
 #define D_TIMER_ENABLE "Използване на графици"
 #define D_TIMER_ARM "Включване"
-#define D_TIMER_TIME "Време"
 #define D_TIMER_DAYS "Дни"
 #define D_TIMER_REPEAT "Повтаряне"
 #define D_TIMER_OUTPUT "Изход"
diff --git a/tasmota/language/ca_AD.h b/tasmota/language/ca_AD.h
index 90495542b..a087c7310 100644
--- a/tasmota/language/ca_AD.h
+++ b/tasmota/language/ca_AD.h
@@ -60,8 +60,8 @@
 #define D_AT "at"
 #define D_AUTO "AUTO"
 #define D_AUTO_UPDATE "Auto Update"
-#define D_BATTERY "Battery"
 #define D_BATT "Bat"                // Short for Battery
+#define D_BATTERY "Battery"
 #define D_BATTERY_CHARGE "Charge"  // Battery charge in %
 #define D_BLINK "Espurna"
 #define D_BLINKOFF "Espurna Fora"
@@ -76,17 +76,17 @@
 #define D_CO2 "Diòxid de Carboni"
 #define D_CODE "codi"                // Button code
 #define D_COLDLIGHT "Freda"
+#define D_COLOR "Color"
 #define D_COMMAND "Ordre"
 #define D_CONNECTED "Connectat"
 #define D_CORS_DOMAIN "Domini CORS"
-#define D_COLOR "Color"
 #define D_COUNT "Compta"
 #define D_COUNTER "Comptador"
 #define D_CT_POWER "Energia CT"
 #define D_CURRENT "Intensitat"          // As in Voltage and Current
 #define D_CURRENT_NEUTRAL "Intensitat Neutre"
-#define D_DATA "Data"
 #define D_DARKLIGHT "Fosc"
+#define D_DATA "Data"
 #define D_DEBUG "Depuració"
 #define D_DEWPOINT "Punt de rossada"
 #define D_DISABLED "Deshabilitat"
@@ -113,15 +113,13 @@
 #define D_FRAGMENTATION "frag."      // Lower case abbreviated version of fragmentation used in "memory fragmentation"
 #define D_FRAME_RATE "Frame rate"
 #define D_FREE_MEMORY "Memòria lliure"
-#define D_PSR_MAX_MEMORY "Memòria PS-RAM"
-#define D_PSR_FREE_MEMORY "Memòria PS-RAM lliure"
 #define D_FREQUENCY "Freqüència"
 #define D_GAS "Gas"
 #define D_GATEWAY "Portal"
 #define D_GROUP "Grup"
-#define D_HOST "Hoste"
 #define D_HALL_EFFECT "Efecte Hall"
 #define D_HEATINDEX "Heat index"
+#define D_HOST "Hoste"
 #define D_HOSTNAME "Nom de màquina"
 #define D_HUMIDITY "Humitat"
 #define D_ILLUMINANCE "Iluminància"
@@ -132,10 +130,11 @@
 #define D_INITIALIZED "Initialitzat"
 #define D_IP_ADDRESS "Adreça IP"
 #define D_LIGHT "Llum"
-#define D_LWT "LWT"
 #define D_LQI "LQI"                  // Zigbee Link Quality Index
+#define D_LWT "LWT"
 #define D_MODULE "Mòdul"
 #define D_MOISTURE "Humitat"
+#define D_MQ "MQ"
 #define D_MQTT "MQTT"
 #define D_MULTI_PRESS "multi-pressió"
 #define D_NOISE "Soroll"
@@ -148,10 +147,9 @@
 #define D_ON "Engegat"
 #define D_ONLINE "Conectat"
 #define D_ORP "ORP"
+#define D_PARTITION "Partició"      // As in flash and firmware partition
 #define D_PASSWORD "Mot de pas"
 #define D_PH "pH"
-#define D_MQ "MQ"
-#define D_PARTITION "Partició"      // As in flash and firmware partition
 #define D_PORT "Port"
 #define D_POWER_FACTOR "Factor de poténcia"
 #define D_POWERUSAGE "Poténcia"
@@ -164,27 +162,31 @@
 #define D_PROGRAM_FLASH_SIZE "Mida de codi a Flash"
 #define D_PROGRAM_SIZE "Mida de codi"
 #define D_PROJECT "Projecte"
+#define D_PSR_FREE_MEMORY "Memòria PS-RAM lliure"
+#define D_PSR_MAX_MEMORY "Memòria PS-RAM"
 #define D_RAIN "Pluja"
 #define D_RANGE "Rang"
 #define D_RECEIVED "Rebut"
 #define D_RESTART "Reinici"
-#define D_RESTARTING "Reinciant"
 #define D_RESTART_REASON "Raó de resinici"
+#define D_RESTARTING "Reinciant"
 #define D_RETAINED "retingut"
 #define D_RULE "Regla"
 #define D_SAVE "Guardar"
 #define D_SENSOR "Sensor"
+#define D_SOC "Estat de canvi"
+#define D_SOH "Estat de salut"
 #define D_SSID "SSId"
 #define D_START "Iniciar"
 #define D_STD_TIME "STD"
 #define D_STOP "Aturar"
 #define D_SUBNET_MASK "Màscara de sub-xarxa"
 #define D_SUBSCRIBE_TO "Subscriu a"
-#define D_UNSUBSCRIBE_FROM "Des subscriu de"
 #define D_SUCCESSFUL "Resultat correcte"
 #define D_SUNRISE "Albada"
 #define D_SUNSET "Posta de sol"
 #define D_TEMPERATURE "Temperatura"
+#define D_TIME_OF_DAY "Time"
 #define D_TO "a"
 #define D_TOGGLE "Canvia"
 #define D_TOPIC "Tòpic"
@@ -195,6 +197,7 @@
 #define D_TWILIGHT_ASTRONOMICAL "Astronomical"
 #define D_TWILIGHT_CIVIL "Civil"
 #define D_TWILIGHT_NAUTICAL "Nautical"
+#define D_UNSUBSCRIBE_FROM "Des subscriu de"
 #define D_UPLOAD "Envia"
 #define D_UPTIME "Temps engegat"
 #define D_USED "usat"
@@ -214,12 +217,10 @@
 #define D_VOC "VOC"
 #define D_VOLTAGE "Tensió"
 #define D_VOLUME "Volum"
-#define D_WEIGHT "Pes"
 #define D_WARMLIGHT "Calent"
-#define D_WEB_SERVER "Servidor Web"
-#define D_SOC "Estat de canvi"
-#define D_SOH "Estat de salut"
 #define D_WATER_DEPTH "Profunditat de l'aigua"
+#define D_WEB_SERVER "Servidor Web"
+#define D_WEIGHT "Pes"
 
 // tasmota.ino
 #define D_WARNING_MINIMAL_VERSION "Avís : Aquesta versió no suporta configuració persistent"
@@ -474,7 +475,6 @@
 #define D_TIMER_PARAMETERS "Timer parameters"
 #define D_TIMER_ENABLE "Enable Timers"
 #define D_TIMER_ARM "Enable"
-#define D_TIMER_TIME "Time"
 #define D_TIMER_DAYS "Days"
 #define D_TIMER_REPEAT "Repeat"
 #define D_TIMER_OUTPUT "Output"
diff --git a/tasmota/language/cs_CZ.h b/tasmota/language/cs_CZ.h
index 5079e2fd8..84209ed5e 100644
--- a/tasmota/language/cs_CZ.h
+++ b/tasmota/language/cs_CZ.h
@@ -60,8 +60,8 @@
 #define D_AT "at"
 #define D_AUTO "AUTO"
 #define D_AUTO_UPDATE "Auto Update"
-#define D_BATTERY "Battery"
 #define D_BATT "Batt"                // Short for Battery
+#define D_BATTERY "Battery"
 #define D_BATTERY_CHARGE "Charge"   // Battery charge in %
 #define D_BLINK "Blikání"
 #define D_BLINKOFF "BlikáníVyp"
@@ -76,17 +76,17 @@
 #define D_CO2 "CO2"
 #define D_CODE "kód"                 // Button code
 #define D_COLDLIGHT "Studené světlo"
+#define D_COLOR "Color"
 #define D_COMMAND "Příkaz"
 #define D_CONNECTED "...připojeno"
 #define D_CORS_DOMAIN "CORS Domain"
-#define D_COLOR "Color"
 #define D_COUNT "Počítej"
 #define D_COUNTER "Počítadlo"
 #define D_CT_POWER "CT Power"
 #define D_CURRENT "Proud"          // As in Voltage and Current
 #define D_CURRENT_NEUTRAL "Current Neutral"
-#define D_DATA "Data"
 #define D_DARKLIGHT "Tmavý"
+#define D_DATA "Data"
 #define D_DEBUG "Debug"
 #define D_DEWPOINT "Dew point"
 #define D_DISABLED "Zablokováno"
@@ -113,15 +113,13 @@
 #define D_FRAGMENTATION "frag."      // Lower case abbreviated version of fragmentation used in "memory fragmentation"
 #define D_FRAME_RATE "Frame rate"
 #define D_FREE_MEMORY "Volná paměť"
-#define D_PSR_MAX_MEMORY "PS-RAM Memory"
-#define D_PSR_FREE_MEMORY "PS-RAM free Memory"
 #define D_FREQUENCY "Kmitočet"
 #define D_GAS "Plyn"
 #define D_GATEWAY "Výchozí brána"
 #define D_GROUP "Skupina"
-#define D_HOST "Server"
 #define D_HALL_EFFECT "Hall Effect"
 #define D_HEATINDEX "Heat index"
+#define D_HOST "Server"
 #define D_HOSTNAME "Název serveru"
 #define D_HUMIDITY "Vlhkost"
 #define D_ILLUMINANCE "Osvětlení"
@@ -132,10 +130,11 @@
 #define D_INITIALIZED "Inicializovaný"
 #define D_IP_ADDRESS "Adresa IP"
 #define D_LIGHT "Světlo"
-#define D_LWT "LWT"
 #define D_LQI "LQI"                  // Zigbee Link Quality Index
+#define D_LWT "LWT"
 #define D_MODULE "Modul"
 #define D_MOISTURE "Moisture"
+#define D_MQ "MQ"
 #define D_MQTT "MQTT"
 #define D_MULTI_PRESS "několikeré-stisknutí"
 #define D_NOISE "Hluk"
@@ -148,10 +147,9 @@
 #define D_ON "Zap."
 #define D_ONLINE "Online"                  // Don't translate, LWT message! Nepředkládat, LWT zpráva!
 #define D_ORP "ORP"
+#define D_PARTITION "Partition"      // As in flash and firmware partition
 #define D_PASSWORD "Heslo"
 #define D_PH "pH"
-#define D_MQ "MQ"
-#define D_PARTITION "Partition"      // As in flash and firmware partition
 #define D_PORT "Port"
 #define D_POWER_FACTOR "Účiník"
 #define D_POWERUSAGE "Příkon"
@@ -164,27 +162,31 @@
 #define D_PROGRAM_FLASH_SIZE "Velikost paměti flash"
 #define D_PROGRAM_SIZE "Velikost programu"
 #define D_PROJECT "Projekt"
+#define D_PSR_FREE_MEMORY "PS-RAM free Memory"
+#define D_PSR_MAX_MEMORY "PS-RAM Memory"
 #define D_RAIN "Rain"
 #define D_RANGE "Range"
 #define D_RECEIVED "Přijatý"
 #define D_RESTART "Restart"
-#define D_RESTARTING "Restartování"
 #define D_RESTART_REASON "Příčina restartu"
+#define D_RESTARTING "Restartování"
 #define D_RETAINED "Zachováno"
 #define D_RULE "Rule"
 #define D_SAVE "Ulož"
 #define D_SENSOR "Sensor"
+#define D_SOC "State of Charge"
+#define D_SOH "State of Health"
 #define D_SSID "SSID"
 #define D_START "Start"
 #define D_STD_TIME "STD"
 #define D_STOP "Stop"
 #define D_SUBNET_MASK "Maska podsítě"
 #define D_SUBSCRIBE_TO "Přihlaš se do"
-#define D_UNSUBSCRIBE_FROM "Unsubscribe from"
 #define D_SUCCESSFUL "úspěšné."
 #define D_SUNRISE "Svítání"
 #define D_SUNSET "Soumrak"
 #define D_TEMPERATURE "Teplota"
+#define D_TIME_OF_DAY "Čas"
 #define D_TO "do"
 #define D_TOGGLE "Přepni"
 #define D_TOPIC "Topic"
@@ -195,6 +197,7 @@
 #define D_TWILIGHT_ASTRONOMICAL "Astronomical"
 #define D_TWILIGHT_CIVIL "Civil"
 #define D_TWILIGHT_NAUTICAL "Nautical"
+#define D_UNSUBSCRIBE_FROM "Unsubscribe from"
 #define D_UPLOAD "Nahrání..."
 #define D_UPTIME "Uptime"
 #define D_USED "used"
@@ -214,12 +217,10 @@
 #define D_VOC "VOC"
 #define D_VOLTAGE "Napětí"
 #define D_VOLUME "Volume"
-#define D_WEIGHT "Hmotnost"
 #define D_WARMLIGHT "Teplé světlo"
-#define D_WEB_SERVER "Web Server"
-#define D_SOC "State of Charge"
-#define D_SOH "State of Health"
 #define D_WATER_DEPTH "Hloubka vody"
+#define D_WEB_SERVER "Web Server"
+#define D_WEIGHT "Hmotnost"
 
 // tasmota.ino
 #define D_WARNING_MINIMAL_VERSION "UPOZORNĚNÍ Tato verze nepodporuje trvalé nastavení"
@@ -474,7 +475,6 @@
 #define D_TIMER_PARAMETERS "Časovač"
 #define D_TIMER_ENABLE "Povol časovače"
 #define D_TIMER_ARM "Aktivní"
-#define D_TIMER_TIME "Čas"
 #define D_TIMER_DAYS "Dny"
 #define D_TIMER_REPEAT "Opakovat"
 #define D_TIMER_OUTPUT "Výstup"
diff --git a/tasmota/language/de_DE.h b/tasmota/language/de_DE.h
index 9a8d1bcea..23e2b6667 100644
--- a/tasmota/language/de_DE.h
+++ b/tasmota/language/de_DE.h
@@ -28,7 +28,7 @@
  * Use online command StateText to translate ON, OFF, HOLD and TOGGLE.
  * Use online command Prefix to translate cmnd, stat and tele.
  *
- * Updated until v14.3.0.7 - Last update 08.12.2024
+ * Updated until v15.0.1.4 - Last update 02.10.2025
 \*********************************************************************/
 
 //#define LANGUAGE_MODULE_NAME         // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English)
@@ -60,8 +60,8 @@
 #define D_AT "an"
 #define D_AUTO "AUTO"
 #define D_AUTO_UPDATE "Auto Update"
-#define D_BATTERY "Batterie"
 #define D_BATT "Batt"                // Short for Battery
+#define D_BATTERY "Batterie"
 #define D_BATTERY_CHARGE "Ladung"    // Battery charge in %
 #define D_BLINK "Blinken"
 #define D_BLINKOFF "BlinkenAus"
@@ -76,21 +76,21 @@
 #define D_CO2 "CO₂"
 #define D_CODE "code"                // Button code
 #define D_COLDLIGHT "kalt"
+#define D_COLOR "Color"
 #define D_COMMAND "Befehl"
 #define D_CONNECTED "verbunden"
 #define D_CORS_DOMAIN "CORS Domain"
-#define D_COLOR "Color"
 #define D_COUNT "Anzahl"             // used as a noun throughout
 #define D_COUNTER "Zähler"
 #define D_CT_POWER "CT Power"
 #define D_CURRENT "Strom"            // As in Voltage and Current
 #define D_CURRENT_NEUTRAL "Strom Neutral"
-#define D_DATA "Daten"
 #define D_DARKLIGHT "dunkel"
+#define D_DATA "Daten"
 #define D_DEBUG "debug"
 #define D_DEWPOINT "Taupunkt"
 #define D_DISABLED "deaktiviert"
-#define D_DISCONNECTED "Disconnected"
+#define D_DISCONNECTED "getrennt"
 #define D_DISTANCE "Abstand"
 #define D_DNS_SERVER "DNS-Server"
 #define D_DO "gelöster Sauerstoff"
@@ -113,15 +113,13 @@
 #define D_FRAGMENTATION "frag․"      // Lower case abbreviated version of fragmentation used in "memory fragmentation"
 #define D_FRAME_RATE "Frame Rate"
 #define D_FREE_MEMORY "Freier Arbeitsspeicher"
-#define D_PSR_MAX_MEMORY "PS-RAM Speicher"
-#define D_PSR_FREE_MEMORY "PS-RAM freier Speicher"
 #define D_FREQUENCY "Frequenz"
 #define D_GAS "Gas"
 #define D_GATEWAY "Gateway"
 #define D_GROUP "Gruppe"
-#define D_HOST "Host"
 #define D_HALL_EFFECT "Hall Effekt"
 #define D_HEATINDEX "Hitzeindex"
+#define D_HOST "Host"
 #define D_HOSTNAME "Hostname"
 #define D_HUMIDITY "Feuchtigkeit"
 #define D_ILLUMINANCE "Beleuchtungsstärke"
@@ -132,10 +130,11 @@
 #define D_INITIALIZED "initialisiert"
 #define D_IP_ADDRESS "IP-Adresse"
 #define D_LIGHT "Licht"
-#define D_LWT "LWT"
 #define D_LQI "LQI"                  // Zigbee Link Quality Index
+#define D_LWT "LWT"
 #define D_MODULE "Modul"
 #define D_MOISTURE "Feuchtigkeit"
+#define D_MQ "MQ"
 #define D_MQTT "MQTT"
 #define D_MULTI_PRESS "Mehrfachdruck"
 #define D_NOISE "Lautstärke"
@@ -148,10 +147,9 @@
 #define D_ON "an"
 #define D_ONLINE "Online"
 #define D_ORP "ORP"
+#define D_PARTITION "Partition"      // As in flash and firmware partition
 #define D_PASSWORD "Passwort"
 #define D_PH "pH"
-#define D_MQ "MQ"
-#define D_PARTITION "Partition"      // As in flash and firmware partition
 #define D_PORT "Port"
 #define D_POWER_FACTOR "Leistungsfaktor"
 #define D_POWERUSAGE "Leistung"
@@ -164,27 +162,31 @@
 #define D_PROGRAM_FLASH_SIZE "Flash nutzbar"
 #define D_PROGRAM_SIZE "Programmgröße"
 #define D_PROJECT "Projekt"
+#define D_PSR_FREE_MEMORY "PS-RAM freier Speicher"
+#define D_PSR_MAX_MEMORY "PS-RAM Speicher"
 #define D_RAIN "Regen"
 #define D_RANGE "Bereich"
 #define D_RECEIVED "erhalten"
 #define D_RESTART "Neustart"
-#define D_RESTARTING "starte neu"
 #define D_RESTART_REASON "Grund für Neustart"
+#define D_RESTARTING "starte neu"
 #define D_RETAINED "beibehalten"
 #define D_RULE "Regel"
 #define D_SAVE "Speichern"
 #define D_SENSOR "Sensor"
+#define D_SOC "Ladestatus"
+#define D_SOH "Gesundheitsstatus"
 #define D_SSID "SSID"
 #define D_START "Start"
 #define D_STD_TIME "STD"
 #define D_STOP "Stop"
 #define D_SUBNET_MASK "Subnetzmaske"
 #define D_SUBSCRIBE_TO "abonniere"
-#define D_UNSUBSCRIBE_FROM "löse Abo․ von"
 #define D_SUCCESSFUL "erfolgreich"
 #define D_SUNRISE "Sonnenaufgang"
 #define D_SUNSET "Sonnenuntergang"
 #define D_TEMPERATURE "Temperatur"
+#define D_TIME_OF_DAY "Uhrzeit"
 #define D_TO "zu"
 #define D_TOGGLE "An/Aus"
 #define D_TOPIC "Topic"
@@ -195,6 +197,7 @@
 #define D_TWILIGHT_ASTRONOMICAL "astronomisch"
 #define D_TWILIGHT_CIVIL "zivil"
 #define D_TWILIGHT_NAUTICAL "nautisch"
+#define D_UNSUBSCRIBE_FROM "löse Abo․ von"
 #define D_UPLOAD "Upload"
 #define D_UPTIME "Laufzeit"
 #define D_USED "genutzt"
@@ -214,15 +217,13 @@
 #define D_VOC "VOC"
 #define D_VOLTAGE "Spannung"
 #define D_VOLUME "Volumen"
-#define D_WEIGHT "Gewicht"
 #define D_WARMLIGHT "warm"
-#define D_WEB_SERVER "Webserver"
-#define D_SOC "Ladestatus"
-#define D_SOH "Gesundheitsstatus"
 #define D_WATER_DEPTH "Wassertiefe"
+#define D_WEB_SERVER "Webserver"
+#define D_WEIGHT "Gewicht"
 
 // tasmota.ino
-#define D_WARNING_MINIMAL_VERSION "ACHTUNG: Diese Version unterstützt keine persistenten Einstellungen"
+#define D_WARNING_MINIMAL_VERSION "ACHTUNG: Einstellungen in dieser Version werden nicht gespeichert!"
 #define D_LEVEL_10 "level 1-0"
 #define D_LEVEL_01 "level 0-1"
 #define D_SERIAL_LOGGING_DISABLED "Serielles Logging deaktiviert"
@@ -262,7 +263,7 @@
 // xdrv_02_webserver.ino
 #define D_NOSCRIPT "JavaScript aktivieren um Tasmota benutzen zu können"
 #define D_SAFEBOOT "SAFEBOOT"
-#define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "MINIMUM-Firmware<br>bitte upgraden"
+#define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "MINIMAL-Firmware<br>Upgrade erforderlich"
 #define D_WEBSERVER_ACTIVE_ON "Webserver aktiv"
 #define D_WITH_IP_ADDRESS "mit IP-Adresse"
 #define D_WEBSERVER_STOPPED "Webserver angehalten"
@@ -278,7 +279,7 @@
 #define D_BUTTON_TOGGLE "An/Aus"
 #define D_CONFIGURATION "Einstellungen"
 #define D_INFORMATION "Informationen"
-#define D_FIRMWARE_UPGRADE "Firmware Update"
+#define D_FIRMWARE_UPGRADE "Firmwareupdate"
 #define D_MANAGEMENT "Werkzeuge"
 #define D_GPIO_VIEWER "GPIO Viewer"
 #define D_CONSOLE "Konsole"
@@ -394,7 +395,7 @@
 #define D_UPGRADE_BY_WEBSERVER "Update über Webserver"
 #define D_OTA_URL "OTA-URL"
 #define D_START_UPGRADE "Starten"
-#define D_UPGRADE_BY_FILE_UPLOAD "Update Datei hochladen"
+#define D_UPGRADE_BY_FILE_UPLOAD "Updatedatei hochladen"
 #define D_UPLOAD_FACTORY "Wechsle zur Safeboot Partition"
 #define D_UPLOAD_STARTED "Upload gestartet"
 #define D_UPGRADE_STARTED "Update gestartet"
@@ -474,7 +475,6 @@
 #define D_TIMER_PARAMETERS "Zeitplan"
 #define D_TIMER_ENABLE "Zeitpläne aktivieren"
 #define D_TIMER_ARM "Aktiv"
-#define D_TIMER_TIME "Uhrzeit"
 #define D_TIMER_DAYS "Wochentage"
 #define D_TIMER_REPEAT "Wiederholen"
 #define D_TIMER_OUTPUT "Ausgang"
diff --git a/tasmota/language/el_GR.h b/tasmota/language/el_GR.h
index 28bef8af1..3c751133b 100644
--- a/tasmota/language/el_GR.h
+++ b/tasmota/language/el_GR.h
@@ -60,8 +60,8 @@
 #define D_AT "at"
 #define D_AUTO "ΑΥΤΟΜΑΤΟ"
 #define D_AUTO_UPDATE "Auto Update"
-#define D_BATTERY "Battery"
 #define D_BATT "Batt"                // Short for Battery
+#define D_BATTERY "Battery"
 #define D_BATTERY_CHARGE "Charge"   // Battery charge in %
 #define D_BLINK "Blink"
 #define D_BLINKOFF "BlinkOff"
@@ -76,17 +76,17 @@
 #define D_CO2 "Διοξείδιο του άνθρακα"
 #define D_CODE "κώδικας"                // Button code
 #define D_COLDLIGHT "Ψυχρό"
+#define D_COLOR "Color"
 #define D_COMMAND "Εντολή"
 #define D_CONNECTED "Συνδεδεμένο"
-#define D_COLOR "Color"
-#define D_COUNT "Μέτρηση"
 #define D_CORS_DOMAIN "CORS Domain"
+#define D_COUNT "Μέτρηση"
 #define D_COUNTER "Μετρητής"
 #define D_CT_POWER "CT Power"
 #define D_CURRENT "Ένταση"          // As in Voltage and Current
 #define D_CURRENT_NEUTRAL "Current Neutral"
-#define D_DATA "Δεδομένα"
 #define D_DARKLIGHT "Σκοτεινό"
+#define D_DATA "Δεδομένα"
 #define D_DEBUG "Debug"
 #define D_DEWPOINT "Dew point"
 #define D_DISABLED "Ανενεργό"
@@ -113,15 +113,13 @@
 #define D_FRAGMENTATION "frag."      // Lower case abbreviated version of fragmentation used in "memory fragmentation"
 #define D_FRAME_RATE "Frame rate"
 #define D_FREE_MEMORY "Ελεύθερη μνήμη"
-#define D_PSR_MAX_MEMORY "PS-RAM Memory"
-#define D_PSR_FREE_MEMORY "PS-RAM free Memory"
 #define D_FREQUENCY "Συχνότητα"
 #define D_GAS "Αέριο"
 #define D_GATEWAY "Πύλη"
 #define D_GROUP "Ομάδα"
-#define D_HOST "Host"
 #define D_HALL_EFFECT "Hall Effect"
 #define D_HEATINDEX "Heat index"
+#define D_HOST "Host"
 #define D_HOSTNAME "Hostname"
 #define D_HUMIDITY "Υγρασία"
 #define D_ILLUMINANCE "Φωτεινότητα"
@@ -132,10 +130,11 @@
 #define D_INITIALIZED "Αρχικοποιήθηκε"
 #define D_IP_ADDRESS "Διεύθυνση IP"
 #define D_LIGHT "Φως"
-#define D_LWT "LWT"
 #define D_LQI "LQI"                  // Zigbee Link Quality Index
+#define D_LWT "LWT"
 #define D_MODULE "Μονάδα"
 #define D_MOISTURE "Moisture"
+#define D_MQ "MQ"
 #define D_MQTT "MQTT"
 #define D_MULTI_PRESS "ανίχνευση για πολλαπλά πατήματα"
 #define D_NOISE "Θόρυβος"
@@ -148,10 +147,9 @@
 #define D_ON "On"
 #define D_ONLINE "Online"
 #define D_ORP "ORP"
+#define D_PARTITION "Partition"      // As in flash and firmware partition
 #define D_PASSWORD "Κωδικός"
 #define D_PH "pH"
-#define D_MQ "MQ"
-#define D_PARTITION "Partition"      // As in flash and firmware partition
 #define D_PORT "Θύρα"
 #define D_POWER_FACTOR "Συντελεστής Ισχύος"
 #define D_POWERUSAGE "Ισχύς"
@@ -164,27 +162,31 @@
 #define D_PROGRAM_FLASH_SIZE "Μέγεθος προγράμματος στη Flash"
 #define D_PROGRAM_SIZE "Μέγεθος προγράμματος"
 #define D_PROJECT "Έργο"
+#define D_PSR_FREE_MEMORY "PS-RAM free Memory"
+#define D_PSR_MAX_MEMORY "PS-RAM Memory"
 #define D_RAIN "Βροχή"
 #define D_RANGE "Εύρος"
 #define D_RECEIVED "Ελήφθη"
 #define D_RESTART "Επανεκκίνηση"
-#define D_RESTARTING "Επανεκκινεί"
 #define D_RESTART_REASON "Αιτία επανεκκίνησης"
+#define D_RESTARTING "Επανεκκινεί"
 #define D_RETAINED "διακράτηση"
 #define D_RULE "Κανόνας"
 #define D_SAVE "Αποθήκευση"
 #define D_SENSOR "Αισθητήρας"
+#define D_SOC "State of Charge"
+#define D_SOH "State of Health"
 #define D_SSID "SSId"
 #define D_START "Εκκίνηση"
 #define D_STD_TIME "STD"
 #define D_STOP "Τερματισμός"
 #define D_SUBNET_MASK "Μάσκα υποδικτύου"
 #define D_SUBSCRIBE_TO "Εγγραφή στο"
-#define D_UNSUBSCRIBE_FROM "Unsubscribe from"
 #define D_SUCCESSFUL "Επιτυχές"
 #define D_SUNRISE "Ανατολή Ηλίου"
 #define D_SUNSET "Ηλιοβασίλεμα"
 #define D_TEMPERATURE "Θερμοκρασία"
+#define D_TIME_OF_DAY "Ώρα"
 #define D_TO "έως"
 #define D_TOGGLE "Εναλλαγή"
 #define D_TOPIC "Topic"
@@ -195,6 +197,7 @@
 #define D_TWILIGHT_ASTRONOMICAL "Astronomical"
 #define D_TWILIGHT_CIVIL "Civil"
 #define D_TWILIGHT_NAUTICAL "Nautical"
+#define D_UNSUBSCRIBE_FROM "Unsubscribe from"
 #define D_UPLOAD "Ανέβασμα"
 #define D_UPTIME "Χρόνος λειτουργίας"
 #define D_USED "used"
@@ -214,12 +217,10 @@
 #define D_VOC "VOC"
 #define D_VOLTAGE "Τάση"
 #define D_VOLUME "Volume"
-#define D_WEIGHT "Βάρος"
 #define D_WARMLIGHT "Θερμό"
-#define D_WEB_SERVER "Διακομιστής Web"
-#define D_SOC "State of Charge"
-#define D_SOH "State of Health"
 #define D_WATER_DEPTH "Βάθος νερού"
+#define D_WEB_SERVER "Διακομιστής Web"
+#define D_WEIGHT "Βάρος"
 
 // tasmota.ino
 #define D_WARNING_MINIMAL_VERSION "ΠΡΟΕΙΔΟΠΟΙΗΣΗ Αυτή η έκδοση δεν αποθηκεύει τις ρυθμίσεις"
@@ -474,7 +475,6 @@
 #define D_TIMER_PARAMETERS "Παράμετροι χρονικών"
 #define D_TIMER_ENABLE "Ενεργοποίηση χρονικών"
 #define D_TIMER_ARM "Οπλισμένο"
-#define D_TIMER_TIME "Ώρα"
 #define D_TIMER_DAYS "Μέρες"
 #define D_TIMER_REPEAT "Επανάληψη"
 #define D_TIMER_OUTPUT "Έξοδος"
diff --git a/tasmota/language/en_GB.h b/tasmota/language/en_GB.h
index ccddb5267..ab1f94f7b 100644
--- a/tasmota/language/en_GB.h
+++ b/tasmota/language/en_GB.h
@@ -60,8 +60,8 @@
 #define D_AT "at"
 #define D_AUTO "AUTO"
 #define D_AUTO_UPDATE "Auto Update"
-#define D_BATTERY "Battery"
 #define D_BATT "Batt"                // Short for Battery
+#define D_BATTERY "Battery"
 #define D_BATTERY_CHARGE "Charge"   // Battery charge in %
 #define D_BLINK "Blink"
 #define D_BLINKOFF "BlinkOff"
@@ -76,17 +76,17 @@
 #define D_CO2 "Carbon dioxide"
 #define D_CODE "code"                // Button code
 #define D_COLDLIGHT "Cold"
+#define D_COLOR "Color"
 #define D_COMMAND "Command"
 #define D_CONNECTED "Connected"
 #define D_CORS_DOMAIN "CORS Domain"
-#define D_COLOR "Color"
 #define D_COUNT "Count"
 #define D_COUNTER "Counter"
 #define D_CT_POWER "CT Power"
 #define D_CURRENT "Current"          // As in Voltage and Current
 #define D_CURRENT_NEUTRAL "Current Neutral"
-#define D_DATA "Data"
 #define D_DARKLIGHT "Dark"
+#define D_DATA "Data"
 #define D_DEBUG "Debug"
 #define D_DEWPOINT "Dew point"
 #define D_DISABLED "Disabled"
@@ -113,15 +113,13 @@
 #define D_FRAGMENTATION "frag."      // Lower case abbreviated version of fragmentation used in "memory fragmentation"
 #define D_FRAME_RATE "Frame rate"
 #define D_FREE_MEMORY "Free Memory"
-#define D_PSR_MAX_MEMORY "PS-RAM Memory"
-#define D_PSR_FREE_MEMORY "PS-RAM free Memory"
 #define D_FREQUENCY "Frequency"
 #define D_GAS "Gas"
 #define D_GATEWAY "Gateway"
 #define D_GROUP "Group"
-#define D_HOST "Host"
 #define D_HALL_EFFECT "Hall Effect"
 #define D_HEATINDEX "Heat index"
+#define D_HOST "Host"
 #define D_HOSTNAME "Hostname"
 #define D_HUMIDITY "Humidity"
 #define D_ILLUMINANCE "Illuminance"
@@ -132,10 +130,11 @@
 #define D_INITIALIZED "Initialized"
 #define D_IP_ADDRESS "IP Address"
 #define D_LIGHT "Light"
-#define D_LWT "LWT"
 #define D_LQI "LQI"                  // Zigbee Link Quality Index
+#define D_LWT "LWT"
 #define D_MODULE "Module"
 #define D_MOISTURE "Moisture"
+#define D_MQ "MQ"
 #define D_MQTT "MQTT"
 #define D_MULTI_PRESS "multi-press"
 #define D_NOISE "Noise"
@@ -148,10 +147,9 @@
 #define D_ON "On"
 #define D_ONLINE "Online"
 #define D_ORP "ORP"
+#define D_PARTITION "Partition"      // As in flash and firmware partition
 #define D_PASSWORD "Password"
 #define D_PH "pH"
-#define D_MQ "MQ"
-#define D_PARTITION "Partition"      // As in flash and firmware partition
 #define D_PORT "Port"
 #define D_POWER_FACTOR "Power Factor"
 #define D_POWERUSAGE "Power"
@@ -164,27 +162,31 @@
 #define D_PROGRAM_FLASH_SIZE "Program Flash Size"
 #define D_PROGRAM_SIZE "Program Size"
 #define D_PROJECT "Project"
+#define D_PSR_FREE_MEMORY "PS-RAM free Memory"
+#define D_PSR_MAX_MEMORY "PS-RAM Memory"
 #define D_RAIN "Rain"
 #define D_RANGE "Range"
 #define D_RECEIVED "Received"
 #define D_RESTART "Restart"
-#define D_RESTARTING "Restarting"
 #define D_RESTART_REASON "Restart Reason"
+#define D_RESTARTING "Restarting"
 #define D_RETAINED "retained"
 #define D_RULE "Rule"
 #define D_SAVE "Save"
 #define D_SENSOR "Sensor"
+#define D_SOC "State of Charge"
+#define D_SOH "State of Health"
 #define D_SSID "SSId"
 #define D_START "Start"
 #define D_STD_TIME "STD"
 #define D_STOP "Stop"
 #define D_SUBNET_MASK "Subnet Mask"
 #define D_SUBSCRIBE_TO "Subscribe to"
-#define D_UNSUBSCRIBE_FROM "Unsubscribe from"
 #define D_SUCCESSFUL "Successful"
 #define D_SUNRISE "Sunrise"
 #define D_SUNSET "Sunset"
 #define D_TEMPERATURE "Temperature"
+#define D_TIME_OF_DAY "Time"
 #define D_TO "to"
 #define D_TOGGLE "Toggle"
 #define D_TOPIC "Topic"
@@ -195,6 +197,7 @@
 #define D_TWILIGHT_ASTRONOMICAL "Astronomical"
 #define D_TWILIGHT_CIVIL "Civil"
 #define D_TWILIGHT_NAUTICAL "Nautical"
+#define D_UNSUBSCRIBE_FROM "Unsubscribe from"
 #define D_UPLOAD "Upload"
 #define D_UPTIME "Uptime"
 #define D_USED "used"
@@ -214,12 +217,10 @@
 #define D_VOC "VOC"
 #define D_VOLTAGE "Voltage"
 #define D_VOLUME "Volume"
-#define D_WEIGHT "Weight"
 #define D_WARMLIGHT "Warm"
-#define D_WEB_SERVER "Web Server"
-#define D_SOC "State of Charge"
-#define D_SOH "State of Health"
 #define D_WATER_DEPTH "Water Depth"
+#define D_WEB_SERVER "Web Server"
+#define D_WEIGHT "Weight"
 
 // tasmota.ino
 #define D_WARNING_MINIMAL_VERSION "WARNING This version does not support persistent settings"
@@ -474,7 +475,6 @@
 #define D_TIMER_PARAMETERS "Timer parameters"
 #define D_TIMER_ENABLE "Enable Timers"
 #define D_TIMER_ARM "Enable"
-#define D_TIMER_TIME "Time"
 #define D_TIMER_DAYS "Days"
 #define D_TIMER_REPEAT "Repeat"
 #define D_TIMER_OUTPUT "Output"
diff --git a/tasmota/language/es_ES.h b/tasmota/language/es_ES.h
index c6a307643..7cccf8776 100644
--- a/tasmota/language/es_ES.h
+++ b/tasmota/language/es_ES.h
@@ -60,8 +60,8 @@
 #define D_AT "at"
 #define D_AUTO "AUTO"
 #define D_AUTO_UPDATE "Auto Update"
-#define D_BATTERY "Battery"
 #define D_BATT "Bat"                // Short for Battery
+#define D_BATTERY "Battery"
 #define D_BATTERY_CHARGE "Charge"   // Battery charge in %
 #define D_BLINK "Blink"
 #define D_BLINKOFF "BlinkOff"
@@ -76,17 +76,17 @@
 #define D_CO2 "CO2"
 #define D_CODE "código"                // Button code
 #define D_COLDLIGHT "Fría"
+#define D_COLOR "Color"
 #define D_COMMAND "Comando"
 #define D_CONNECTED "Conectado"
 #define D_CORS_DOMAIN "Sitio WEB para CORS"
-#define D_COLOR "Color"
 #define D_COUNT "Conteo"
 #define D_COUNTER "Contador"
 #define D_CT_POWER "CT Power"
 #define D_CURRENT "Corriente"          // As in Voltage and Current
 #define D_CURRENT_NEUTRAL "Current Neutral"
-#define D_DATA "Datos"
 #define D_DARKLIGHT "Oscuro"
+#define D_DATA "Datos"
 #define D_DEBUG "Debug"
 #define D_DEWPOINT "Punto de Rocío"
 #define D_DISABLED "Deshabilitado"
@@ -113,15 +113,13 @@
 #define D_FRAGMENTATION "frag."      // Lower case abbreviated version of fragmentation used in "memory fragmentation"
 #define D_FRAME_RATE "Frame rate"
 #define D_FREE_MEMORY "Memoria Libre"
-#define D_PSR_MAX_MEMORY "Memoria PS-RAM"
-#define D_PSR_FREE_MEMORY "Memoria PS-RAM libre"
 #define D_FREQUENCY "Frecuencia"
 #define D_GAS "Gas"
 #define D_GATEWAY "Gateway"
 #define D_GROUP "Grupo"
-#define D_HOST "Host"
 #define D_HALL_EFFECT "Efecto Hall"
 #define D_HEATINDEX "Heat index"
+#define D_HOST "Host"
 #define D_HOSTNAME "Hostname"
 #define D_HUMIDITY "Humedad"
 #define D_ILLUMINANCE "Luminancia"
@@ -132,10 +130,11 @@
 #define D_INITIALIZED "Inicializado"
 #define D_IP_ADDRESS "Dirección IP"
 #define D_LIGHT "Luz"
-#define D_LWT "LWT"
 #define D_LQI "LQI"                  // Zigbee Link Quality Index
+#define D_LWT "LWT"
 #define D_MODULE "Módulo"
 #define D_MOISTURE "Humedad del Suelo"
+#define D_MQ "MQ"
 #define D_MQTT "MQTT"
 #define D_MULTI_PRESS "multi-press"
 #define D_NOISE "Ruido"
@@ -148,10 +147,9 @@
 #define D_ON "Encendido"
 #define D_ONLINE "Online"
 #define D_ORP "ORP"
+#define D_PARTITION "Partition"      // As in flash and firmware partition
 #define D_PASSWORD "Clave"
 #define D_PH "pH"
-#define D_MQ "MQ"
-#define D_PARTITION "Partition"      // As in flash and firmware partition
 #define D_PORT "Puerto"
 #define D_POWER_FACTOR "Factor de Potencia"
 #define D_POWERUSAGE "Potencia"
@@ -164,27 +162,31 @@
 #define D_PROGRAM_FLASH_SIZE "Tamaño de Flash de Programa"
 #define D_PROGRAM_SIZE "Tamaño Programa"
 #define D_PROJECT "Proyecto"
+#define D_PSR_FREE_MEMORY "Memoria PS-RAM libre"
+#define D_PSR_MAX_MEMORY "Memoria PS-RAM"
 #define D_RAIN "Lluvia"
 #define D_RANGE "Rango"
 #define D_RECEIVED "Recibido"
 #define D_RESTART "Reiniciar"
-#define D_RESTARTING "Reiniciando"
 #define D_RESTART_REASON "Causa Reinicio"
+#define D_RESTARTING "Reiniciando"
 #define D_RETAINED "Grabado"
 #define D_RULE "Regla"
 #define D_SAVE "Grabar"
 #define D_SENSOR "Sensor"
+#define D_SOC "Estado de Carga"
+#define D_SOH "Estado de Salud"
 #define D_SSID "SSId"
 #define D_START "Iniciar"
 #define D_STD_TIME "STD"
 #define D_STOP "Detener"
 #define D_SUBNET_MASK "Máscara Subred"
 #define D_SUBSCRIBE_TO "Suscribir a"
-#define D_UNSUBSCRIBE_FROM "Desuscribirse de"
 #define D_SUCCESSFUL "Exitosa"
 #define D_SUNRISE "Salida del Sol"
 #define D_SUNSET "Puesta del Sol"
 #define D_TEMPERATURE "Temperatura"
+#define D_TIME_OF_DAY "Hora"
 #define D_TO "a"
 #define D_TOGGLE "Conmutar"
 #define D_TOPIC "Topic"
@@ -195,6 +197,7 @@
 #define D_TWILIGHT_ASTRONOMICAL "Astronomical"
 #define D_TWILIGHT_CIVIL "Civil"
 #define D_TWILIGHT_NAUTICAL "Nautical"
+#define D_UNSUBSCRIBE_FROM "Desuscribirse de"
 #define D_UPLOAD "Carga"
 #define D_UPTIME "Tiempo Encendido"
 #define D_USED "used"
@@ -214,12 +217,10 @@
 #define D_VOC "VOC"
 #define D_VOLTAGE "Tensión"
 #define D_VOLUME "Volumen"
-#define D_WEIGHT "Peso"
 #define D_WARMLIGHT "Cálida"
-#define D_WEB_SERVER "Servidor Web"
-#define D_SOC "Estado de Carga"
-#define D_SOH "Estado de Salud"
 #define D_WATER_DEPTH "Profundidad del agua"
+#define D_WEB_SERVER "Servidor Web"
+#define D_WEIGHT "Peso"
 
 // tasmota.ino
 #define D_WARNING_MINIMAL_VERSION "Cuidado, esta versión no guarda los cambios"
@@ -474,7 +475,6 @@
 #define D_TIMER_PARAMETERS "Parámetros de Temporizadores"
 #define D_TIMER_ENABLE "Habilitar Temporizadores"
 #define D_TIMER_ARM "Activo"
-#define D_TIMER_TIME "Hora"
 #define D_TIMER_DAYS "Días"
 #define D_TIMER_REPEAT "Repetir"
 #define D_TIMER_OUTPUT "Salida"
diff --git a/tasmota/language/fr_FR.h b/tasmota/language/fr_FR.h
index c4f24dba9..decc6c735 100644
--- a/tasmota/language/fr_FR.h
+++ b/tasmota/language/fr_FR.h
@@ -60,8 +60,8 @@
 #define D_AT "at"
 #define D_AUTO "AUTO"
 #define D_AUTO_UPDATE "Auto Update"
-#define D_BATTERY "Battery"
 #define D_BATT "Batt"                // Short for Battery
+#define D_BATTERY "Battery"
 #define D_BATTERY_CHARGE "Charge"    // Battery charge in %
 #define D_BLINK "Blink"              // Not better in french
 #define D_BLINKOFF "BlinkOff"
@@ -76,17 +76,17 @@
 #define D_CO2 "Dioxyde de carbone"
 #define D_CODE "code"                // Button code
 #define D_COLDLIGHT "Froid"
+#define D_COLOR "Color"
 #define D_COMMAND "Commande"
 #define D_CONNECTED "Connecté"
 #define D_CORS_DOMAIN "Domaine CORS"
-#define D_COLOR "Color"
 #define D_COUNT "Compte"
 #define D_COUNTER "Compteur"
 #define D_CT_POWER "Puissance CT"
 #define D_CURRENT "Courant"          // As in Voltage and Current
 #define D_CURRENT_NEUTRAL "Courant neutre"
-#define D_DATA "Donnée"
 #define D_DARKLIGHT "Sombre"
+#define D_DATA "Donnée"
 #define D_DEBUG "Debug"
 #define D_DEWPOINT "Point de rosée"
 #define D_DISABLED "Désactivé"
@@ -113,15 +113,13 @@
 #define D_FRAGMENTATION "frag."      // Lower case abbreviated version of fragmentation used in "memory fragmentation"
 #define D_FRAME_RATE "Fréq. image"
 #define D_FREE_MEMORY "Mémoire libre"
-#define D_PSR_MAX_MEMORY "Mémoire PS-RAM"
-#define D_PSR_FREE_MEMORY "Mémoire PS-RAM libre"
 #define D_FREQUENCY "Fréquence"
 #define D_GAS "Gaz"
 #define D_GATEWAY "Passerelle"
 #define D_GROUP "Groupe"
-#define D_HOST "Hôte"
 #define D_HALL_EFFECT "Effet Hall"
 #define D_HEATINDEX "Heat index"
+#define D_HOST "Hôte"
 #define D_HOSTNAME "Nom d'Hôte"
 #define D_HUMIDITY "Humidité"
 #define D_ILLUMINANCE "Éclairement"
@@ -132,10 +130,11 @@
 #define D_INITIALIZED "Initialisé"
 #define D_IP_ADDRESS "Adresse IP"
 #define D_LIGHT "Lumière"
-#define D_LWT "LWT"					         // MQTT Last Will and Testament
 #define D_LQI "LQI"                  // ZigBee Link Quality Index
+#define D_LWT "LWT"					         // MQTT Last Will and Testament
 #define D_MODULE "Module"
 #define D_MOISTURE "Humidité"
+#define D_MQ "MQ"                    // MQ series Gas sensor
 #define D_MQTT "MQTT"
 #define D_MULTI_PRESS "multi-pression"
 #define D_NOISE "Bruit"
@@ -148,10 +147,9 @@
 #define D_ON "Marche"
 #define D_ONLINE "Connecté"
 #define D_ORP "Redox"                // Oxidation Reduction Potential
+#define D_PARTITION "Partition"      // As in flash and firmware partition
 #define D_PASSWORD "Mot de passe"
 #define D_PH "pH"
-#define D_MQ "MQ"                    // MQ series Gas sensor
-#define D_PARTITION "Partition"      // As in flash and firmware partition
 #define D_PORT "Port"
 #define D_POWER_FACTOR "Fact de puiss"
 #define D_POWERUSAGE "Puissance"
@@ -164,27 +162,31 @@
 #define D_PROGRAM_FLASH_SIZE "Taille Flash Programme"
 #define D_PROGRAM_SIZE "Taille programme"
 #define D_PROJECT "Projet"
+#define D_PSR_FREE_MEMORY "Mémoire PS-RAM libre"
+#define D_PSR_MAX_MEMORY "Mémoire PS-RAM"
 #define D_RAIN "Pluie"
 #define D_RANGE "Intervalle"
 #define D_RECEIVED "Reçu"
 #define D_RESTART "Redémarrage"
-#define D_RESTARTING "Redémarre"
 #define D_RESTART_REASON "Raison du redémarrage"
+#define D_RESTARTING "Redémarre"
 #define D_RETAINED "persistant"		   // MQTT
 #define D_RULE "Règle"
 #define D_SAVE "Enregistrer"
 #define D_SENSOR "Capteur"
+#define D_SOC "État de la Charge"
+#define D_SOH "État de Santé"
 #define D_SSID "SSID"
 #define D_START "Lancer"	         // "Lancer la mise à jour"
 #define D_STD_TIME "STD"
 #define D_STOP "Stop"
 #define D_SUBNET_MASK "Masque sous-réseau"
 #define D_SUBSCRIBE_TO "S'abonner à"
-#define D_UNSUBSCRIBE_FROM "Se désabonner de"
 #define D_SUCCESSFUL "Réussi"
 #define D_SUNRISE "Lever du jour"
 #define D_SUNSET "Tombée de la nuit"
 #define D_TEMPERATURE "Température"
+#define D_TIME_OF_DAY "Temps"
 #define D_TO "à"
 #define D_TOGGLE "Inverser"
 #define D_TOPIC "Topic"              // Keep MQTT keyword
@@ -195,6 +197,7 @@
 #define D_TWILIGHT_ASTRONOMICAL "Astronomical"
 #define D_TWILIGHT_CIVIL "Civil"
 #define D_TWILIGHT_NAUTICAL "Nautical"
+#define D_UNSUBSCRIBE_FROM "Se désabonner de"
 #define D_UPLOAD "Upload"            // Not better in french
 #define D_UPTIME "Durée d'activité"
 #define D_USED "utilisé"
@@ -214,12 +217,10 @@
 #define D_VOC "VOC"
 #define D_VOLTAGE "Tension"
 #define D_VOLUME "Volume"
-#define D_WEIGHT "Poids"
 #define D_WARMLIGHT "Chaud"
-#define D_WEB_SERVER "Serveur web"
-#define D_SOC "État de la Charge"
-#define D_SOH "État de Santé"
 #define D_WATER_DEPTH "Profondeur de l’eau"
+#define D_WEB_SERVER "Serveur web"
+#define D_WEIGHT "Poids"
 
 // tasmota.ino
 #define D_WARNING_MINIMAL_VERSION "ATTENTION Cette version ne gère pas les réglages persistants"
@@ -474,7 +475,6 @@
 #define D_TIMER_PARAMETERS "Paramètres Timer"
 #define D_TIMER_ENABLE "Activer les Timers"
 #define D_TIMER_ARM "Armer"
-#define D_TIMER_TIME "Temps"
 #define D_TIMER_DAYS "Jours"
 #define D_TIMER_REPEAT "Répéter"
 #define D_TIMER_OUTPUT "Sortie"
diff --git a/tasmota/language/fy_NL.h b/tasmota/language/fy_NL.h
index 9da335a89..27fa8c1d9 100644
--- a/tasmota/language/fy_NL.h
+++ b/tasmota/language/fy_NL.h
@@ -60,8 +60,8 @@
 #define D_AT "at"
 #define D_AUTO "AUTO"
 #define D_AUTO_UPDATE "Auto Update"
-#define D_BATTERY "Battery"
 #define D_BATT "Batt"                // Short for Battery
+#define D_BATTERY "Battery"
 #define D_BATTERY_CHARGE "Lading"    // Battery charge in %
 #define D_BLINK "Blinkje"
 #define D_BLINKOFF "BlinkjeUit"
@@ -76,17 +76,17 @@
 #define D_CO2 "Koalstofdiokside"
 #define D_CODE "koade"                // Button code
 #define D_COLDLIGHT "Kâld"
+#define D_COLOR "Color"
 #define D_COMMAND "Oarder"
 #define D_CONNECTED "Ferbûn"
 #define D_CORS_DOMAIN "CORS Domain"
-#define D_COLOR "Color"
 #define D_COUNT "Nûmer"
 #define D_COUNTER "Teller"
 #define D_CT_POWER "CT Power"
 #define D_CURRENT "Streame"          // As in Voltage and Current
 #define D_CURRENT_NEUTRAL "Current Neutral"
-#define D_DATA "Data"
 #define D_DARKLIGHT "Tsjuster"
+#define D_DATA "Data"
 #define D_DEBUG "Debugearje"
 #define D_DEWPOINT "Dauwpunt"
 #define D_DISABLED "Útsetten"
@@ -113,15 +113,13 @@
 #define D_FRAGMENTATION "frag."      // Lower case abbreviated version of fragmentation used in "memory fragmentation"
 #define D_FRAME_RATE "Frame rate"
 #define D_FREE_MEMORY "Fergese geheugen"
-#define D_PSR_MAX_MEMORY "PS-RAM geheugen"
-#define D_PSR_FREE_MEMORY "PS-RAM fergese geheugen"
 #define D_FREQUENCY "Frekwinsje"
 #define D_GAS "Gas"
 #define D_GATEWAY "Poarte"
 #define D_GROUP "Groep"
-#define D_HOST "Host"
 #define D_HALL_EFFECT "Hall Effect"
 #define D_HEATINDEX "Heat index"
+#define D_HOST "Host"
 #define D_HOSTNAME "Hostnamme"
 #define D_HUMIDITY "Feuchte"
 #define D_ILLUMINANCE "Beljochting"
@@ -132,10 +130,11 @@
 #define D_INITIALIZED "Inisjalisearre"
 #define D_IP_ADDRESS "IP Adres"
 #define D_LIGHT "Ljocht"
-#define D_LWT "LWT"
 #define D_LQI "LQI"                  // Zigbee Link Quality Index
+#define D_LWT "LWT"
 #define D_MODULE "Module"
 #define D_MOISTURE "Feuchte"
+#define D_MQ "MQ"
 #define D_MQTT "MQTT"
 #define D_MULTI_PRESS "meardere"
 #define D_NOISE "Lûd"
@@ -148,10 +147,9 @@
 #define D_ON "Oan"
 #define D_ONLINE "Online"
 #define D_ORP "ORP"
+#define D_PARTITION "Partition"      // As in flash and firmware partition
 #define D_PASSWORD "Wachtwurd"
 #define D_PH "pH"
-#define D_MQ "MQ"
-#define D_PARTITION "Partition"      // As in flash and firmware partition
 #define D_PORT "Poort"
 #define D_POWER_FACTOR "Krêftfaktor"
 #define D_POWERUSAGE "Krêft"
@@ -164,27 +162,31 @@
 #define D_PROGRAM_FLASH_SIZE "Programma Flash Grutte"
 #define D_PROGRAM_SIZE "Programma Grutte"
 #define D_PROJECT "Projekt"
+#define D_PSR_FREE_MEMORY "PS-RAM fergese geheugen"
+#define D_PSR_MAX_MEMORY "PS-RAM geheugen"
 #define D_RAIN "Rein"
 #define D_RANGE "Berik"
 #define D_RECEIVED "Ûntfange"
 #define D_RESTART "Op 'e nij begjinne"
-#define D_RESTARTING "Op 'e nij begjinne"
 #define D_RESTART_REASON "Reden opnij starte"
+#define D_RESTARTING "Op 'e nij begjinne"
 #define D_RETAINED "beholden"
 #define D_RULE "Regel"
 #define D_SAVE "Bewarje"
 #define D_SENSOR "Sensor"
+#define D_SOC "State of Charge"
+#define D_SOH "State of Charge"
 #define D_SSID "SSId"
 #define D_START "Begjin"
 #define D_STD_TIME "WT"
 #define D_STOP "Stopje"
 #define D_SUBNET_MASK "Subnet Masker"
 #define D_SUBSCRIBE_TO "Ynskriuwe foar"
-#define D_UNSUBSCRIBE_FROM "Ofmelde fan"
 #define D_SUCCESSFUL "Sukses"
 #define D_SUNRISE "Sunrise"
 #define D_SUNSET "Sinneûndergong"
 #define D_TEMPERATURE "Temperatuer"
+#define D_TIME_OF_DAY "Tiid"
 #define D_TO "nei"
 #define D_TOGGLE "Wikselje"  // Wissel, Tuimel
 #define D_TOPIC "Ûnderwerp"  // Onderwerp
@@ -195,6 +197,7 @@
 #define D_TWILIGHT_ASTRONOMICAL "Astronomical"
 #define D_TWILIGHT_CIVIL "Civil"
 #define D_TWILIGHT_NAUTICAL "Nautical"
+#define D_UNSUBSCRIBE_FROM "Ofmelde fan"
 #define D_UPLOAD "Stjoere"
 #define D_UPTIME "Betjenstiid"
 #define D_USED "used"
@@ -214,12 +217,10 @@
 #define D_VOC "VOC"
 #define D_VOLTAGE "Foltaazje"
 #define D_VOLUME "Folume"
-#define D_WEIGHT "Gewicht"
 #define D_WARMLIGHT "Waarm"
-#define D_WEB_SERVER "Webserver"
-#define D_SOC "State of Charge"
-#define D_SOH "State of Charge"
 #define D_WATER_DEPTH "Vattendjup"
+#define D_WEB_SERVER "Webserver"
+#define D_WEIGHT "Gewicht"
 
 // tasmota.ino
 #define D_WARNING_MINIMAL_VERSION "WARSKOGING Dizze ferzje bewarret gjin ynstellings"
@@ -474,7 +475,6 @@
 #define D_TIMER_PARAMETERS "Timerskakelaar parameters"
 #define D_TIMER_ENABLE "Skeakelje timers yn"
 #define D_TIMER_ARM "Aktyf"
-#define D_TIMER_TIME "Tiid"
 #define D_TIMER_DAYS "Dagen"
 #define D_TIMER_REPEAT "Werhelje"
 #define D_TIMER_OUTPUT "Útgong"
diff --git a/tasmota/language/he_HE.h b/tasmota/language/he_HE.h
index 78fe466ec..e9411a1f6 100644
--- a/tasmota/language/he_HE.h
+++ b/tasmota/language/he_HE.h
@@ -60,8 +60,8 @@
 #define D_AT "at"
 #define D_AUTO "אוטומטי"
 #define D_AUTO_UPDATE "Auto Update"
-#define D_BATTERY "Battery"
 #define D_BATT "Batt"                // Short for Battery
+#define D_BATTERY "Battery"
 #define D_BATTERY_CHARGE "Charge"   // Battery charge in %
 #define D_BLINK "מהבהב"
 #define D_BLINKOFF "כיבוי היבהוב"
@@ -76,17 +76,17 @@
 #define D_CO2 "פחמן דו חמצני"
 #define D_CODE "קוד"                // Button code
 #define D_COLDLIGHT "אור קר"
+#define D_COLOR "Color"
 #define D_COMMAND "פקודה"
 #define D_CONNECTED "מחובר"
 #define D_CORS_DOMAIN "CORS Domain"
-#define D_COLOR "Color"
 #define D_COUNT "סופר"
 #define D_COUNTER "מונה"
 #define D_CT_POWER "CT Power"
 #define D_CURRENT "נוכחי"          // As in Voltage and Current
 #define D_CURRENT_NEUTRAL "Current Neutral"
-#define D_DATA "נתונים"
 #define D_DARKLIGHT "חושך"
+#define D_DATA "נתונים"
 #define D_DEBUG "באגים"
 #define D_DEWPOINT "Dew point"
 #define D_DISABLED "מבוטל"
@@ -113,15 +113,13 @@
 #define D_FRAGMENTATION "frag."      // Lower case abbreviated version of fragmentation used in "memory fragmentation"
 #define D_FRAME_RATE "Frame rate"
 #define D_FREE_MEMORY "זכרון פנוי"
-#define D_PSR_MAX_MEMORY "PS-RAM Memory"
-#define D_PSR_FREE_MEMORY "PS-RAM free Memory"
 #define D_FREQUENCY "תדר"
 #define D_GAS "גז"
 #define D_GATEWAY "שער"
 #define D_GROUP "קבוצה"
-#define D_HOST "מארח"
 #define D_HALL_EFFECT "Hall Effect"
 #define D_HEATINDEX "Heat index"
+#define D_HOST "מארח"
 #define D_HOSTNAME "שם מארח"
 #define D_HUMIDITY "לחות"
 #define D_ILLUMINANCE "רמת חשיפה"
@@ -132,10 +130,11 @@
 #define D_INITIALIZED "מאותחל"
 #define D_IP_ADDRESS "IP כתובת"
 #define D_LIGHT "אור"
-#define D_LWT "LWT"
 #define D_LQI "LQI"                  // Zigbee Link Quality Index
+#define D_LWT "LWT"
 #define D_MODULE "מודול"
 #define D_MOISTURE "Moisture"
+#define D_MQ "MQ"
 #define D_MQTT "MQTT"
 #define D_MULTI_PRESS "לחיצה מרובה"
 #define D_NOISE "רעש"
@@ -148,10 +147,9 @@
 #define D_ON "פועל"
 #define D_ONLINE "מחובר"
 #define D_ORP "ORP"
+#define D_PARTITION "Partition"      // As in flash and firmware partition
 #define D_PASSWORD "סיסמא"
 #define D_PH "pH"
-#define D_MQ "MQ"
-#define D_PARTITION "Partition"      // As in flash and firmware partition
 #define D_PORT "פורט"
 #define D_POWER_FACTOR "גורם כוח"
 #define D_POWERUSAGE "כוח"
@@ -164,27 +162,31 @@
 #define D_PROGRAM_FLASH_SIZE "גודל תוכנית פלאש"
 #define D_PROGRAM_SIZE "גודל תוכנית"
 #define D_PROJECT "פרויקט"
+#define D_PSR_FREE_MEMORY "PS-RAM free Memory"
+#define D_PSR_MAX_MEMORY "PS-RAM Memory"
 #define D_RAIN "גשם"
 #define D_RANGE "Range"
 #define D_RECEIVED "התקבל"
 #define D_RESTART "איתחול"
-#define D_RESTARTING "הפעלה מחדש"
 #define D_RESTART_REASON "סיבת הפעלה מחדש"
+#define D_RESTARTING "הפעלה מחדש"
 #define D_RETAINED "שמור"
 #define D_RULE "חוק"
 #define D_SAVE "שמירה"
 #define D_SENSOR "חיישן"
+#define D_SOC "State of Charge"
+#define D_SOH "State of Health"
 #define D_SSID "SSId"
 #define D_START "התחלה"
 #define D_STD_TIME "STD"
 #define D_STOP "עצירה"
 #define D_SUBNET_MASK "רשת מסכת משנה"
 #define D_SUBSCRIBE_TO "הרשם ל"
-#define D_UNSUBSCRIBE_FROM "בטל רישום"
 #define D_SUCCESSFUL "הצליח"
 #define D_SUNRISE "זריחה"
 #define D_SUNSET "שקיעה"
 #define D_TEMPERATURE "טמפרטורה"
+#define D_TIME_OF_DAY "זמן"
 #define D_TO "ל"
 #define D_TOGGLE "מתג"
 #define D_TOPIC "נושא"
@@ -195,6 +197,7 @@
 #define D_TWILIGHT_ASTRONOMICAL "Astronomical"
 #define D_TWILIGHT_CIVIL "Civil"
 #define D_TWILIGHT_NAUTICAL "Nautical"
+#define D_UNSUBSCRIBE_FROM "בטל רישום"
 #define D_UPLOAD "העלאה"
 #define D_UPTIME "זמן עליה"
 #define D_USED "used"
@@ -214,12 +217,10 @@
 #define D_VOC "VOC"
 #define D_VOLTAGE "מתח"
 #define D_VOLUME "Volume"
-#define D_WEIGHT "משקל"
 #define D_WARMLIGHT "חום"
-#define D_WEB_SERVER "Web שרת"
-#define D_SOC "State of Charge"
-#define D_SOH "State of Health"
 #define D_WATER_DEPTH "עומק המים"
+#define D_WEB_SERVER "Web שרת"
+#define D_WEIGHT "משקל"
 
 // tasmota.ino
 #define D_WARNING_MINIMAL_VERSION "אזהרה גרסה זו אינה תומכת בהגדרות קבועות"
@@ -474,7 +475,6 @@
 #define D_TIMER_PARAMETERS "פרמטרים עבור תזמון"
 #define D_TIMER_ENABLE "אפשר תזמון"
 #define D_TIMER_ARM "טען"
-#define D_TIMER_TIME "זמן"
 #define D_TIMER_DAYS "ימים"
 #define D_TIMER_REPEAT "חזרות"
 #define D_TIMER_OUTPUT "פלט"
diff --git a/tasmota/language/hu_HU.h b/tasmota/language/hu_HU.h
index 1af1e6f6b..8b20bc528 100644
--- a/tasmota/language/hu_HU.h
+++ b/tasmota/language/hu_HU.h
@@ -60,8 +60,8 @@
 #define D_AT "at"
 #define D_AUTO "AUTO"
 #define D_AUTO_UPDATE "Auto Update"
-#define D_BATTERY "Battery"
 #define D_BATT "Batt"                // Short for Battery
+#define D_BATTERY "Battery"
 #define D_BATTERY_CHARGE "Charge"   // Battery charge in %
 #define D_BLINK "Villogás"
 #define D_BLINKOFF "Villogás ki"
@@ -76,17 +76,17 @@
 #define D_CO2 "Szén-dioxid"
 #define D_CODE "kód"                // Button code
 #define D_COLDLIGHT "Hideg fény"
+#define D_COLOR "Color"
 #define D_COMMAND "Parancs"
 #define D_CONNECTED "Csatlakoztatva"
 #define D_CORS_DOMAIN "CORS Domain"
-#define D_COLOR "Color"
 #define D_COUNT "Szám"
 #define D_COUNTER "Számláló"
 #define D_CT_POWER "CT erősség"
 #define D_CURRENT "Áramerősség"          // As in Voltage and Current
 #define D_CURRENT_NEUTRAL "Current Neutral"
-#define D_DATA "Adat"
 #define D_DARKLIGHT "Min. fényerő"
+#define D_DATA "Adat"
 #define D_DEBUG "Debug"
 #define D_DEWPOINT "Harmatpont"
 #define D_DISABLED "Letiltva"
@@ -113,15 +113,13 @@
 #define D_FRAGMENTATION "frag."      // Lower case abbreviated version of fragmentation used in "memory fragmentation"
 #define D_FRAME_RATE "Frame rate"
 #define D_FREE_MEMORY "Szabad memória"
-#define D_PSR_MAX_MEMORY "PS-RAM memória"
-#define D_PSR_FREE_MEMORY "PS-RAM szabad memória"
 #define D_FREQUENCY "Frekvencia"
 #define D_GAS "Gáz"
 #define D_GATEWAY "Átjáró"
 #define D_GROUP "Csoport"
-#define D_HOST "Hoszt"
 #define D_HALL_EFFECT "Hall Effect"
 #define D_HEATINDEX "Heat index"
+#define D_HOST "Hoszt"
 #define D_HOSTNAME "Hosztnév"
 #define D_HUMIDITY "Páratartalom"
 #define D_ILLUMINANCE "Megvilágítás"
@@ -132,10 +130,11 @@
 #define D_INITIALIZED "Inicializálva"
 #define D_IP_ADDRESS "IP cím"
 #define D_LIGHT "Fény"
-#define D_LWT "LWT"
 #define D_LQI "LQI"                  // Zigbee Link Quality Index
+#define D_LWT "LWT"
 #define D_MODULE "Modul"
 #define D_MOISTURE "Páratartalom"
+#define D_MQ "MQ"
 #define D_MQTT "MQTT"
 #define D_MULTI_PRESS "többes lenyomás"
 #define D_NOISE "Zaj"
@@ -148,10 +147,9 @@
 #define D_ON "Be"
 #define D_ONLINE "Online"
 #define D_ORP "ORP"
+#define D_PARTITION "Partition"      // As in flash and firmware partition
 #define D_PASSWORD "Jelszó"
 #define D_PH "pH"
-#define D_MQ "MQ"
-#define D_PARTITION "Partition"      // As in flash and firmware partition
 #define D_PORT "Port"
 #define D_POWER_FACTOR "Teljesítménytényező"
 #define D_POWERUSAGE "Energiafelhasználás"
@@ -164,27 +162,31 @@
 #define D_PROGRAM_FLASH_SIZE "Program flash méret"
 #define D_PROGRAM_SIZE "Program méret"
 #define D_PROJECT "Projekt"
+#define D_PSR_FREE_MEMORY "PS-RAM szabad memória"
+#define D_PSR_MAX_MEMORY "PS-RAM memória"
 #define D_RAIN "Eső"
 #define D_RANGE "Tartomány"
 #define D_RECEIVED "Érkezett"
 #define D_RESTART "Újraindítás"
-#define D_RESTARTING "Újraindítás"
 #define D_RESTART_REASON "Utolsó újraindulás oka"
+#define D_RESTARTING "Újraindítás"
 #define D_RETAINED "megtartott"
 #define D_RULE "Szabály"
 #define D_SAVE "Mentés"
 #define D_SENSOR "Szenzor"
+#define D_SOC "State of Charge"
+#define D_SOH "State of Health"
 #define D_SSID "SSID"
 #define D_START "Start"
 #define D_STD_TIME "STD"
 #define D_STOP "Leállítás"
 #define D_SUBNET_MASK "Alhálózati maszk"
 #define D_SUBSCRIBE_TO "Feliratkozás a(z)"
-#define D_UNSUBSCRIBE_FROM "Leiratkozás a(z)"
 #define D_SUCCESSFUL "Sikeres"
 #define D_SUNRISE "Napkelte"
 #define D_SUNSET "Napnyugta"
 #define D_TEMPERATURE "Hőmérséklet"
+#define D_TIME_OF_DAY "Idő"
 #define D_TO "-nak"
 #define D_TOGGLE "Megfordítás"
 #define D_TOPIC "Topic"
@@ -195,6 +197,7 @@
 #define D_TWILIGHT_ASTRONOMICAL "Astronomical"
 #define D_TWILIGHT_CIVIL "Civil"
 #define D_TWILIGHT_NAUTICAL "Nautical"
+#define D_UNSUBSCRIBE_FROM "Leiratkozás a(z)"
 #define D_UPLOAD "Feltöltés"
 #define D_UPTIME "Üzemidő"
 #define D_USED "used"
@@ -214,12 +217,10 @@
 #define D_VOC "VOC"
 #define D_VOLTAGE "Feszültség"
 #define D_VOLUME "Volume"
-#define D_WEIGHT "Tömeg"
 #define D_WARMLIGHT "Meleg fény"
-#define D_WEB_SERVER "Webszerver"
-#define D_SOC "State of Charge"
-#define D_SOH "State of Health"
 #define D_WATER_DEPTH "Vízmélység"
+#define D_WEB_SERVER "Webszerver"
+#define D_WEIGHT "Tömeg"
 
 // tasmota.ino
 #define D_WARNING_MINIMAL_VERSION "VIGYÁZZ! Ez a verzió nem támogat tartós beállításokat"
@@ -474,7 +475,6 @@
 #define D_TIMER_PARAMETERS "Időzítő paraméterei"
 #define D_TIMER_ENABLE "Időzítők engedélyezve"
 #define D_TIMER_ARM "Be"
-#define D_TIMER_TIME "Idő"
 #define D_TIMER_DAYS "Napok"
 #define D_TIMER_REPEAT "Ismétlés"
 #define D_TIMER_OUTPUT "Kimenet"
diff --git a/tasmota/language/it_IT.h b/tasmota/language/it_IT.h
index 9b9113d9d..575f17c00 100644
--- a/tasmota/language/it_IT.h
+++ b/tasmota/language/it_IT.h
@@ -60,8 +60,8 @@
 #define D_AT                   "in"
 #define D_AUTO                 "AUTO"
 #define D_AUTO_UPDATE          "Aggiornamento automatico"
-#define D_BATTERY              "Batteria"
 #define D_BATT                 "Batt"                 // Short for Battery
+#define D_BATTERY              "Batteria"
 #define D_BATTERY_CHARGE       "Carica"               // Battery charge in %
 #define D_BLINK                "Lampeggia"
 #define D_BLINKOFF             "Lampeggia OFF"
@@ -76,17 +76,17 @@
 #define D_CO2                  "CO2"
 #define D_CODE                 "codice"              // Button code
 #define D_COLDLIGHT            "Fredda"
+#define D_COLOR                "Colore"
 #define D_COMMAND              "Comando"
 #define D_CONNECTED            "Connesso"
 #define D_CORS_DOMAIN          "Dominio CORS"
-#define D_COLOR                "Colore"
 #define D_COUNT                "Conteggio"
 #define D_COUNTER              "Contatore"
 #define D_CT_POWER             "Alimentazione CT"
 #define D_CURRENT              "Corrente"            // As in Voltage and Current
 #define D_CURRENT_NEUTRAL      "Corrente neutrale"
-#define D_DATA                 "Dati"
 #define D_DARKLIGHT            "Scuro"
+#define D_DATA                 "Dati"
 #define D_DEBUG                "Debug"
 #define D_DEWPOINT             "Punto rugiada" //
 #define D_DISABLED             "Disabilitato/a"
@@ -113,15 +113,13 @@
 #define D_FRAGMENTATION        "framm."      // Lower case abbreviated version of fragmentation used in "memory fragmentation"
 #define D_FRAME_RATE           "Frequenza fotogrammi"
 #define D_FREE_MEMORY          "Memoria libera"
-#define D_PSR_MAX_MEMORY       "PS-RAM - Memoria"
-#define D_PSR_FREE_MEMORY      "PS-RAM - Memoria libera"
 #define D_FREQUENCY            "Frequenza"
 #define D_GAS                  "Gas"
 #define D_GATEWAY              "Gateway"
 #define D_GROUP                "Gruppo"
-#define D_HOST                 "Host"
 #define D_HALL_EFFECT          "Effetto hall"
 #define D_HEATINDEX            "Indice calore"
+#define D_HOST                 "Host"
 #define D_HOSTNAME             "Nome host"
 #define D_HUMIDITY             "Umidità"
 #define D_ILLUMINANCE          "Illuminazione"
@@ -132,10 +130,11 @@
 #define D_INITIALIZED          "Inizializzato"
 #define D_IP_ADDRESS           "Indirizzo IP"
 #define D_LIGHT                "Luce"
-#define D_LWT                  "LWT"
 #define D_LQI                  "LQI"                  // Zigbee Link Quality Index
+#define D_LWT                  "LWT"
 #define D_MODULE               "Modulo"
 #define D_MOISTURE             "Umidità"
+#define D_MQ                   "MQ"
 #define D_MQTT                 "MQTT"
 #define D_MULTI_PRESS          "multi-pressione"
 #define D_NOISE                "Rumore"
@@ -148,10 +147,9 @@
 #define D_ON                   "ON"
 #define D_ONLINE               "Online"
 #define D_ORP                  "ORP"
+#define D_PARTITION            "Partizione"      // As in flash and firmware partition
 #define D_PASSWORD             "Password"
 #define D_PH                   "pH"
-#define D_MQ                   "MQ"
-#define D_PARTITION            "Partizione"      // As in flash and firmware partition
 #define D_PORT                 "Porta"
 #define D_POWER_FACTOR         "Fattore di potenza"
 #define D_POWERUSAGE           "Potenza"
@@ -164,27 +162,31 @@
 #define D_PROGRAM_FLASH_SIZE   "Dimensione flash"
 #define D_PROGRAM_SIZE         "Dimensione programma"
 #define D_PROJECT              "Progetto"
+#define D_PSR_FREE_MEMORY      "PS-RAM - Memoria libera"
+#define D_PSR_MAX_MEMORY       "PS-RAM - Memoria"
 #define D_RAIN                 "Pioggia"
 #define D_RANGE                "Intervallo"
 #define D_RECEIVED             "Ricevuto"
 #define D_RESTART              "Riavvia"
-#define D_RESTARTING           "Riavvio"
 #define D_RESTART_REASON       "Causa riavvio"
+#define D_RESTARTING           "Riavvio"
 #define D_RETAINED             "salvato"
 #define D_RULE                 "Regola"
 #define D_SAVE                 "Salva"
 #define D_SENSOR               "Sensore"
+#define D_SOC                  "Stato di carica"
+#define D_SOH                  "State di salute"
 #define D_SSID                 "SSID"
 #define D_START                "Esegui"
 #define D_STD_TIME             "STD"
 #define D_STOP                 "Stop"
 #define D_SUBNET_MASK          "Maschera sottorete"
 #define D_SUBSCRIBE_TO         "Abbonati a"
-#define D_UNSUBSCRIBE_FROM     "Rimuovi abbonamento da"
 #define D_SUCCESSFUL           "Completato"
 #define D_SUNRISE              "Alba"
 #define D_SUNSET               "Tramonto"
 #define D_TEMPERATURE          "Temperatura"
+#define D_TIME_OF_DAY                 "Ora"
 #define D_TO                   "a"
 #define D_TOGGLE               "ON/OFF"
 #define D_TOPIC                "Topic"
@@ -195,6 +197,7 @@
 #define D_TWILIGHT_ASTRONOMICAL "astronomico"
 #define D_TWILIGHT_CIVIL       "civile"
 #define D_TWILIGHT_NAUTICAL    "nautico"
+#define D_UNSUBSCRIBE_FROM     "Rimuovi abbonamento da"
 #define D_UPLOAD               "Caricamento"
 #define D_UPTIME               "Tempo accensione"
 #define D_USED                 "usati"
@@ -214,12 +217,10 @@
 #define D_VOC                  "VOC"
 #define D_VOLTAGE              "Tensione"
 #define D_VOLUME               "Volume"
-#define D_WEIGHT               "Peso"
 #define D_WARMLIGHT            "Calda"
-#define D_WEB_SERVER           "Server web"
-#define D_SOC                  "Stato di carica"
-#define D_SOH                  "State di salute"
 #define D_WATER_DEPTH          "Profondità dell'acqua"
+#define D_WEB_SERVER           "Server web"
+#define D_WEIGHT               "Peso"
 
 // tasmota.ino
 #define D_WARNING_MINIMAL_VERSION  "ATTENZIONE Questa versione non supporta il salvataggio delle impostazioni"
@@ -474,7 +475,6 @@
 #define D_TIMER_PARAMETERS  "Parametri timer"
 #define D_TIMER_ENABLE      "Abilita timer"
 #define D_TIMER_ARM         "Abilita"
-#define D_TIMER_TIME        "Ora"
 #define D_TIMER_DAYS        "Giorni"
 #define D_TIMER_REPEAT      "Ripeti"
 #define D_TIMER_OUTPUT      "Uscita"
diff --git a/tasmota/language/ko_KO.h b/tasmota/language/ko_KO.h
index 124a3cdbc..4139ab364 100644
--- a/tasmota/language/ko_KO.h
+++ b/tasmota/language/ko_KO.h
@@ -60,8 +60,8 @@
 #define D_AT "at"
 #define D_AUTO "자동"
 #define D_AUTO_UPDATE "Auto Update"
-#define D_BATTERY "Battery"
 #define D_BATT "Batt"                // Short for Battery
+#define D_BATTERY "Battery"
 #define D_BATTERY_CHARGE "Charge"   // Battery charge in %
 #define D_BLINK "깜박임"
 #define D_BLINKOFF "깜박임 끄기"
@@ -76,17 +76,17 @@
 #define D_CO2 "이산화탄소"
 #define D_CODE "code"                // Button code
 #define D_COLDLIGHT "차갑게"
+#define D_COLOR "Color"
 #define D_COMMAND "커맨드"
 #define D_CONNECTED "연결됨"
-#define D_COLOR "Color"
-#define D_COUNT "횟수"
 #define D_CORS_DOMAIN "CORS Domain"
+#define D_COUNT "횟수"
 #define D_COUNTER "Counter"
 #define D_CT_POWER "CT Power"
 #define D_CURRENT "전류"          // As in Voltage and Current
 #define D_CURRENT_NEUTRAL "Current Neutral"
-#define D_DATA "Data"
 #define D_DARKLIGHT "어둡게"
+#define D_DATA "Data"
 #define D_DEBUG "디버그"
 #define D_DEWPOINT "Dew point"
 #define D_DISABLED "사용안함"
@@ -113,15 +113,13 @@
 #define D_FRAGMENTATION "frag."      // Lower case abbreviated version of fragmentation used in "memory fragmentation"
 #define D_FRAME_RATE "Frame rate"
 #define D_FREE_MEMORY "남은 메모리"
-#define D_PSR_MAX_MEMORY "PS-RAM Memory"
-#define D_PSR_FREE_MEMORY "PS-RAM free Memory"
 #define D_FREQUENCY "Frequency"
 #define D_GAS "가스"
 #define D_GATEWAY "게이트웨이"
 #define D_GROUP "그룹"
-#define D_HOST "호스트"
 #define D_HALL_EFFECT "Hall Effect"
 #define D_HEATINDEX "Heat index"
+#define D_HOST "호스트"
 #define D_HOSTNAME "호스트이름"
 #define D_HUMIDITY "습도"
 #define D_ILLUMINANCE "조도"
@@ -132,10 +130,11 @@
 #define D_INITIALIZED "초기화됨"
 #define D_IP_ADDRESS "IP 주소"
 #define D_LIGHT "밝게"
-#define D_LWT "LWT"
 #define D_LQI "LQI"                  // Zigbee Link Quality Index
+#define D_LWT "LWT"
 #define D_MODULE "모듈"
 #define D_MOISTURE "Moisture"
+#define D_MQ "MQ"
 #define D_MQTT "MQTT"
 #define D_MULTI_PRESS "multi-press"
 #define D_NOISE "소음"
@@ -148,10 +147,9 @@
 #define D_ON "켜짐"
 #define D_ONLINE "온라인"
 #define D_ORP "ORP"
+#define D_PARTITION "Partition"      // As in flash and firmware partition
 #define D_PASSWORD "비밀번호"
 #define D_PH "pH"
-#define D_MQ "MQ"
-#define D_PARTITION "Partition"      // As in flash and firmware partition
 #define D_PORT "포트"
 #define D_POWER_FACTOR "Power Factor"
 #define D_POWERUSAGE "전원"
@@ -164,27 +162,31 @@
 #define D_PROGRAM_FLASH_SIZE "플래시 용량"
 #define D_PROGRAM_SIZE "프로그램 용량"
 #define D_PROJECT "프로젝트"
+#define D_PSR_FREE_MEMORY "PS-RAM free Memory"
+#define D_PSR_MAX_MEMORY "PS-RAM Memory"
 #define D_RAIN "비"
 #define D_RANGE "Range"
 #define D_RECEIVED "받음"
 #define D_RESTART "재시작"
-#define D_RESTARTING "재시작 중.."
 #define D_RESTART_REASON "재시작 사유"
+#define D_RESTARTING "재시작 중.."
 #define D_RETAINED "보류"
 #define D_RULE "규칙"
 #define D_SAVE "저장"
 #define D_SENSOR "센서"
+#define D_SOC "State of Charge"
+#define D_SOH "State of Health"
 #define D_SSID "SSId"
 #define D_START "시작"
 #define D_STD_TIME "STD"
 #define D_STOP "정지"
 #define D_SUBNET_MASK "서브넷 마스크"
 #define D_SUBSCRIBE_TO "구독"
-#define D_UNSUBSCRIBE_FROM "구독 해제"
 #define D_SUCCESSFUL "성공"
 #define D_SUNRISE "일출"
 #define D_SUNSET "일몰"
 #define D_TEMPERATURE "온도"
+#define D_TIME_OF_DAY "시간"
 #define D_TO "to"
 #define D_TOGGLE "켜기/끄기"
 #define D_TOPIC "Topic"
@@ -195,6 +197,7 @@
 #define D_TWILIGHT_ASTRONOMICAL "Astronomical"
 #define D_TWILIGHT_CIVIL "Civil"
 #define D_TWILIGHT_NAUTICAL "Nautical"
+#define D_UNSUBSCRIBE_FROM "구독 해제"
 #define D_UPLOAD "업로드"
 #define D_UPTIME "가동시간"
 #define D_USED "used"
@@ -214,12 +217,10 @@
 #define D_VOC "VOC"
 #define D_VOLTAGE "전압"
 #define D_VOLUME "Volume"
-#define D_WEIGHT "무게"
 #define D_WARMLIGHT "따뜻하게"
-#define D_WEB_SERVER "웹 서버"
-#define D_SOC "State of Charge"
-#define D_SOH "State of Health"
 #define D_WATER_DEPTH "수심"
+#define D_WEB_SERVER "웹 서버"
+#define D_WEIGHT "무게"
 
 // tasmota.ino
 #define D_WARNING_MINIMAL_VERSION "경고: 이 버전은 영구 설정을 지원하지 않습니다"
@@ -474,7 +475,6 @@
 #define D_TIMER_PARAMETERS "타이머 설정"
 #define D_TIMER_ENABLE "타이머 사용"
 #define D_TIMER_ARM "Arm"
-#define D_TIMER_TIME "시간"
 #define D_TIMER_DAYS "일"
 #define D_TIMER_REPEAT "반복"
 #define D_TIMER_OUTPUT "출력"
diff --git a/tasmota/language/lt_LT.h b/tasmota/language/lt_LT.h
index fbbb42d47..28c6c8bcd 100644
--- a/tasmota/language/lt_LT.h
+++ b/tasmota/language/lt_LT.h
@@ -60,8 +60,8 @@
 #define D_AT "prie"
 #define D_AUTO "AUTOMATINĖ"
 #define D_AUTO_UPDATE "Auto Update"
-#define D_BATTERY "Baterija"
 #define D_BATT "Baterija"             // Short for Battery
+#define D_BATTERY "Baterija"
 #define D_BATTERY_CHARGE "Įkrova"    // Battery charge in %
 #define D_BLINK "Mirksėti"
 #define D_BLINKOFF "Mirksėjimas išjungtas"
@@ -76,17 +76,17 @@
 #define D_CO2 "Anglies dioksidas"
 #define D_CODE "kodas"                // Button code
 #define D_COLDLIGHT "Šalta"
+#define D_COLOR "Spalva"
 #define D_COMMAND "Komanda"
 #define D_CONNECTED "Prisijungta"
 #define D_CORS_DOMAIN "CORS Domenas"
-#define D_COLOR "Spalva"
 #define D_COUNT "Skaičius"
 #define D_COUNTER "Skaitiklis"
 #define D_CT_POWER "CT Galia"
 #define D_CURRENT "Srovė"            // As in Voltage and Current
 #define D_CURRENT_NEUTRAL "Neutralios linijos srovė"
-#define D_DATA "Duomenys"
 #define D_DARKLIGHT "Tamsu"
+#define D_DATA "Duomenys"
 #define D_DEBUG "Derinimas"
 #define D_DEWPOINT "Rasos taškas"
 #define D_DISABLED "Išjungta"
@@ -113,15 +113,13 @@
 #define D_FRAGMENTATION "frag."      // Lower case abbreviated version of fragmentation used in "memory fragmentation"
 #define D_FRAME_RATE "Kadrų dažnis"
 #define D_FREE_MEMORY "Laisva atmintis"
-#define D_PSR_MAX_MEMORY "PS-RAM atmintis"
-#define D_PSR_FREE_MEMORY "Laisva PS-RAM atmintis"
 #define D_FREQUENCY "Dažnis"
 #define D_GAS "Dujos"
 #define D_GATEWAY "Tinklo vartai"
 #define D_GROUP "Grupė"
-#define D_HOST "Serveris"
 #define D_HALL_EFFECT "Holo efektas"
 #define D_HEATINDEX "Karščio indeksas"
+#define D_HOST "Serveris"
 #define D_HOSTNAME "Mazgo pavadinimas"
 #define D_HUMIDITY "Drėgmė"
 #define D_ILLUMINANCE "Apšvietimas"
@@ -132,10 +130,11 @@
 #define D_INITIALIZED "Inicializuota"
 #define D_IP_ADDRESS "IP adresas"
 #define D_LIGHT "Šviesa"
-#define D_LWT "LWT"                   // Palikti taip pat, nes susiję su MQTT Last Will and Testament
 #define D_LQI "LQI"                   // Zigbee ryšio kokybės indeksas
+#define D_LWT "LWT"                   // Palikti taip pat, nes susiję su MQTT Last Will and Testament
 #define D_MODULE "Modulis"
 #define D_MOISTURE "Drėgmės lygis"
+#define D_MQ "MQ"
 #define D_MQTT "MQTT"
 #define D_MULTI_PRESS "kelių paspaudimų funkcija"
 #define D_NOISE "Triukšmas"
@@ -148,10 +147,9 @@
 #define D_ON "Įjungta"
 #define D_ONLINE "Prisijungęs"
 #define D_ORP "ORP"
+#define D_PARTITION "Partition"      // As in flash and firmware partition
 #define D_PASSWORD "Slaptažodis"
 #define D_PH "pH"
-#define D_MQ "MQ"
-#define D_PARTITION "Partition"      // As in flash and firmware partition
 #define D_PORT "Prievadas"
 #define D_POWER_FACTOR "Galios koeficientas"
 #define D_POWERUSAGE "Energijos suvartojimas"
@@ -164,27 +162,31 @@
 #define D_PROGRAM_FLASH_SIZE "Programos Flash dydis"
 #define D_PROGRAM_SIZE "Programos dydis"
 #define D_PROJECT "Projektas"
+#define D_PSR_FREE_MEMORY "Laisva PS-RAM atmintis"
+#define D_PSR_MAX_MEMORY "PS-RAM atmintis"
 #define D_RAIN "Lietus"
 #define D_RANGE "Diapazonas"
 #define D_RECEIVED "Gauta"
 #define D_RESTART "Paleisti iš naujo"
-#define D_RESTARTING "Paleidžiama iš naujo"
 #define D_RESTART_REASON "Perkrovimo priežastis"
+#define D_RESTARTING "Paleidžiama iš naujo"
 #define D_RETAINED "išlaikyta"
 #define D_RULE "Taisyklė"
 #define D_SAVE "Išsaugoti"
 #define D_SENSOR "Jutiklis"
+#define D_SOC "Įkrovos būsena"
+#define D_SOH "State of Health"
 #define D_SSID "SSId"
 #define D_START "Pradėti"
 #define D_STD_TIME "Standartinis laikas"
 #define D_STOP "Stabdyti"
 #define D_SUBNET_MASK "Potinklio kaukė"
 #define D_SUBSCRIBE_TO "Prenumeruoti"
-#define D_UNSUBSCRIBE_FROM "Atsisakyti prenumeratos"
 #define D_SUCCESSFUL "Sėkmingai"
 #define D_SUNRISE "Saulėtekis"
 #define D_SUNSET "Saulėlydis"
 #define D_TEMPERATURE "Temperatūra"
+#define D_TIME_OF_DAY "Laikas"
 #define D_TO "į"
 #define D_TOGGLE "Perjungti"
 #define D_TOPIC "Tema"
@@ -195,6 +197,7 @@
 #define D_TWILIGHT_ASTRONOMICAL "Astronominis"
 #define D_TWILIGHT_CIVIL "Pilietinis"
 #define D_TWILIGHT_NAUTICAL "Jūrinis"
+#define D_UNSUBSCRIBE_FROM "Atsisakyti prenumeratos"
 #define D_UPLOAD "Įkelti"
 #define D_UPTIME "Veikimo laikas"
 #define D_USED "naudota"
@@ -214,12 +217,10 @@
 #define D_VOC "VOC"
 #define D_VOLTAGE "Įtampa"
 #define D_VOLUME "Tūris"
-#define D_WEIGHT "Svoris"
 #define D_WARMLIGHT "Šilta"
-#define D_WEB_SERVER "Web serveris"
-#define D_SOC "Įkrovos būsena"
-#define D_SOH "State of Health"
 #define D_WATER_DEPTH "Vandens gylis"
+#define D_WEB_SERVER "Web serveris"
+#define D_WEIGHT "Svoris"
 
 // tasmota.ino
 #define D_WARNING_MINIMAL_VERSION "ĮSPĖJIMAS: Ši versija nepalaiko nuolatinių nustatymų"
@@ -474,7 +475,6 @@
 #define D_TIMER_PARAMETERS "Laikmačio parametrai"
 #define D_TIMER_ENABLE "Įjungti laikmačius"
 #define D_TIMER_ARM "Įjungti"
-#define D_TIMER_TIME "Laikas"
 #define D_TIMER_DAYS "Dienos"
 #define D_TIMER_REPEAT "Kartoti"
 #define D_TIMER_OUTPUT "Išvestis"
diff --git a/tasmota/language/nl_NL.h b/tasmota/language/nl_NL.h
index aff1f888f..22c6a3aad 100644
--- a/tasmota/language/nl_NL.h
+++ b/tasmota/language/nl_NL.h
@@ -60,8 +60,8 @@
 #define D_AT "at"
 #define D_AUTO "AUTO"
 #define D_AUTO_UPDATE "Auto Update"
-#define D_BATTERY "Battery"
 #define D_BATT "Batt"                // Short for Battery
+#define D_BATTERY "Battery"
 #define D_BATTERY_CHARGE "Lading"    // Battery charge in %
 #define D_BLINK "Knipper"
 #define D_BLINKOFF "KnipperUit"
@@ -76,17 +76,17 @@
 #define D_CO2 "CO₂"
 #define D_CODE "code"                // Button code
 #define D_COLDLIGHT "Koud"
+#define D_COLOR "Color"
 #define D_COMMAND "Opdracht"
 #define D_CONNECTED "Verbonden"
-#define D_COLOR "Color"
-#define D_COUNT "Aantal"
 #define D_CORS_DOMAIN "CORS Domain"
+#define D_COUNT "Aantal"
 #define D_COUNTER "Teller"
 #define D_CT_POWER "CT Power"
 #define D_CURRENT "Stroom"          // As in Voltage and Current
 #define D_CURRENT_NEUTRAL "Current Neutral"
-#define D_DATA "Data"
 #define D_DARKLIGHT "Donker"
+#define D_DATA "Data"
 #define D_DEBUG "Debug"
 #define D_DEWPOINT "Dauwpunt"
 #define D_DISABLED "Uitgeschakeld"
@@ -113,15 +113,13 @@
 #define D_FRAGMENTATION "frag."      // Lower case abbreviated version of fragmentation used in "memory fragmentation"
 #define D_FRAME_RATE "Frame rate"
 #define D_FREE_MEMORY "Vrij geheugen"
-#define D_PSR_MAX_MEMORY "PS-RAM Memory"
-#define D_PSR_FREE_MEMORY "PS-RAM free Memory"
 #define D_FREQUENCY "Frequentie"
 #define D_GAS "Gas"
 #define D_GATEWAY "Gateway"
 #define D_GROUP "Groep"
-#define D_HOST "Host"
 #define D_HALL_EFFECT "Hall Effect"
 #define D_HEATINDEX "Heat index"
+#define D_HOST "Host"
 #define D_HOSTNAME "Hostnaam"
 #define D_HUMIDITY "Luchtvochtigheid"
 #define D_ILLUMINANCE "Verlichtingssterkte"
@@ -132,10 +130,11 @@
 #define D_INITIALIZED "Geinitialiseerd"
 #define D_IP_ADDRESS "IP Adres"
 #define D_LIGHT "Licht"
-#define D_LWT "LWT"
 #define D_LQI "LQI"                  // Zigbee Link Quality Index
+#define D_LWT "LWT"
 #define D_MODULE "Module"
 #define D_MOISTURE "Vochtigheid"
+#define D_MQ "MQ"
 #define D_MQTT "MQTT"
 #define D_MULTI_PRESS "meervoudig"
 #define D_NOISE "Lawaai"
@@ -148,10 +147,9 @@
 #define D_ON "Aan"
 #define D_ONLINE "Online"
 #define D_ORP "ORP"
+#define D_PARTITION "Partition"      // As in flash and firmware partition
 #define D_PASSWORD "Wachtwoord"
 #define D_PH "pH"
-#define D_MQ "MQ"
-#define D_PARTITION "Partition"      // As in flash and firmware partition
 #define D_PORT "Poort"
 #define D_POWER_FACTOR "Arbeidsfactor"
 #define D_POWERUSAGE "Vermogen"
@@ -164,27 +162,31 @@
 #define D_PROGRAM_FLASH_SIZE "Programma Flash Grootte"
 #define D_PROGRAM_SIZE "Programma Grootte"
 #define D_PROJECT "Project"
+#define D_PSR_FREE_MEMORY "PS-RAM free Memory"
+#define D_PSR_MAX_MEMORY "PS-RAM Memory"
 #define D_RAIN "Regen"
 #define D_RANGE "Range"
 #define D_RECEIVED "Ontvangen"
 #define D_RESTART "Herstart"
-#define D_RESTARTING "Herstarten"
 #define D_RESTART_REASON "Reden herstart"
+#define D_RESTARTING "Herstarten"
 #define D_RETAINED "behouden"
 #define D_RULE "Regel"
 #define D_SAVE "Opslaan"
 #define D_SENSOR "Sensor"
+#define D_SOC "Laadtoestand"
+#define D_SOH "Gezondheid"
 #define D_SSID "SSId"
 #define D_START "Start"
 #define D_STD_TIME "WT"
 #define D_STOP "Stop"
 #define D_SUBNET_MASK "Subnet Masker"
 #define D_SUBSCRIBE_TO "Abonneer op"
-#define D_UNSUBSCRIBE_FROM "Uitschrijven van"
 #define D_SUCCESSFUL "Gelukt"
 #define D_SUNRISE "Zonsopgang"
 #define D_SUNSET "Zonsondergang"
 #define D_TEMPERATURE "Temperatuur"
+#define D_TIME_OF_DAY "Tijd"
 #define D_TO "naar"
 #define D_TOGGLE "Toggle"  // Wissel, Tuimel
 #define D_TOPIC "Topic"  // Onderwerp
@@ -195,6 +197,7 @@
 #define D_TWILIGHT_ASTRONOMICAL "Astronomical"
 #define D_TWILIGHT_CIVIL "Civil"
 #define D_TWILIGHT_NAUTICAL "Nautical"
+#define D_UNSUBSCRIBE_FROM "Uitschrijven van"
 #define D_UPLOAD "Verzenden"
 #define D_UPTIME "Bedrijfstijd"
 #define D_USED "used"
@@ -214,12 +217,10 @@
 #define D_VOC "VOC"
 #define D_VOLTAGE "Spanning"
 #define D_VOLUME "Volume"
-#define D_WEIGHT "Gewicht"
 #define D_WARMLIGHT "Warm"
-#define D_WEB_SERVER "Webserver"
-#define D_SOC "Laadtoestand"
-#define D_SOH "Gezondheid"
 #define D_WATER_DEPTH "Diepte van het water"
+#define D_WEB_SERVER "Webserver"
+#define D_WEIGHT "Gewicht"
 
 // tasmota.ino
 #define D_WARNING_MINIMAL_VERSION "WAARSCHUWING Deze versie bewaart geen instellingen"
@@ -474,7 +475,6 @@
 #define D_TIMER_PARAMETERS "Tijdschakelaar parameters"
 #define D_TIMER_ENABLE "Tijdschakelaars inschakelen"
 #define D_TIMER_ARM "Actief"
-#define D_TIMER_TIME "Tijd"
 #define D_TIMER_DAYS "Dagen"
 #define D_TIMER_REPEAT "Herhaal"
 #define D_TIMER_OUTPUT "Uitgang"
diff --git a/tasmota/language/pl_PL.h b/tasmota/language/pl_PL.h
index 9ae73b7fe..3a764ef42 100644
--- a/tasmota/language/pl_PL.h
+++ b/tasmota/language/pl_PL.h
@@ -60,8 +60,8 @@
 #define D_AT "at"
 #define D_AUTO "AUTO"
 #define D_AUTO_UPDATE "Auto Update"
-#define D_BATTERY "Bateria"
 #define D_BATT "Bat"                // Short for Battery
+#define D_BATTERY "Bateria"
 #define D_BATTERY_CHARGE "Ładowanie"   // Battery charge in %
 #define D_BLINK "Miganie"
 #define D_BLINKOFF "Miganie - Wył."
@@ -76,17 +76,17 @@
 #define D_CO2 "Dwutlenek węgla"
 #define D_CODE "Kod"                 // Button code
 #define D_COLDLIGHT "Zimny"
+#define D_COLOR "Kolor"
 #define D_COMMAND "Komenda"
 #define D_CONNECTED "Połączony"
 #define D_CORS_DOMAIN "Domena CORS"
-#define D_COLOR "Kolor"
 #define D_COUNT "Licz"
 #define D_COUNTER "Licznik"
 #define D_CT_POWER "Moc CT"
 #define D_CURRENT "Prąd"          // As in Voltage and Current
 #define D_CURRENT_NEUTRAL "Prąd N"
-#define D_DATA "Dane"
 #define D_DARKLIGHT "Ciemny"
+#define D_DATA "Dane"
 #define D_DEBUG "Debug"
 #define D_DEWPOINT "Punkt rosy"
 #define D_DISABLED "Wyłączony"
@@ -113,15 +113,13 @@
 #define D_FRAGMENTATION "frag."      // Lower case abbreviated version of fragmentation used in "memory fragmentation"
 #define D_FRAME_RATE "Liczba klatek"
 #define D_FREE_MEMORY "Wolna pamięć"
-#define D_PSR_MAX_MEMORY "Pamięć PS-RAM"
-#define D_PSR_FREE_MEMORY "Wolna pamięć PS-RAM"
 #define D_FREQUENCY "Częstotliwość"
 #define D_GAS "Gaz"
 #define D_GATEWAY "Brama"
 #define D_GROUP "Grupa"
-#define D_HOST "Serwer"
 #define D_HALL_EFFECT "Efekt Hall'a"
 #define D_HEATINDEX "Indeks ciepła"
+#define D_HOST "Serwer"
 #define D_HOSTNAME "Nazwa serwera"
 #define D_HUMIDITY "Wilgotność"
 #define D_ILLUMINANCE "Podświetlanie"
@@ -132,10 +130,11 @@
 #define D_INITIALIZED "Zainicjowany"
 #define D_IP_ADDRESS "Adres IP"
 #define D_LIGHT "Światło"
-#define D_LWT "LWT"
 #define D_LQI "LQI"                  // Zigbee Link Quality Index
+#define D_LWT "LWT"
 #define D_MODULE "Moduł"
 #define D_MOISTURE "Wilgotność"
+#define D_MQ "MQ"
 #define D_MQTT "MQTT"
 #define D_MULTI_PRESS "Wielokrotne naciśnięcie"
 #define D_NOISE "Szum"
@@ -148,10 +147,9 @@
 #define D_ON "Załączony"
 #define D_ONLINE "Aktywny"
 #define D_ORP "ORP"
+#define D_PARTITION "Partycja"      // As in flash and firmware partition
 #define D_PASSWORD "Hasło"
 #define D_PH "pH"
-#define D_MQ "MQ"
-#define D_PARTITION "Partycja"      // As in flash and firmware partition
 #define D_PORT "Port"
 #define D_POWER_FACTOR "Cosinus fi"
 #define D_POWERUSAGE "Moc"
@@ -164,27 +162,31 @@
 #define D_PROGRAM_FLASH_SIZE "Rozmiar programu flash"
 #define D_PROGRAM_SIZE "Rozmiar programu"
 #define D_PROJECT "Projekt"
+#define D_PSR_FREE_MEMORY "Wolna pamięć PS-RAM"
+#define D_PSR_MAX_MEMORY "Pamięć PS-RAM"
 #define D_RAIN "Deszcz"
 #define D_RANGE "Zakres"
 #define D_RECEIVED "Otrzymany"
 #define D_RESTART "Restart"
-#define D_RESTARTING "Restartowanie"
 #define D_RESTART_REASON "Przyczyna restartu"
+#define D_RESTARTING "Restartowanie"
 #define D_RETAINED "Zachowane"
 #define D_RULE "Reguła"
 #define D_SAVE "Zapisz"
 #define D_SENSOR "Czujnik"
+#define D_SOC "Stan naładowania"
+#define D_SOH "Kondycja"
 #define D_SSID "SSID"
 #define D_START "Start"
 #define D_STD_TIME "STD"
 #define D_STOP "Stop"
 #define D_SUBNET_MASK "Maska podsieci"
 #define D_SUBSCRIBE_TO "Subskrybuj"
-#define D_UNSUBSCRIBE_FROM "Nie subskrybuj"
 #define D_SUCCESSFUL "Powodzenie"
 #define D_SUNRISE "Wschód słońca"
 #define D_SUNSET "Zachód słońca"
 #define D_TEMPERATURE "Temperatura"
+#define D_TIME_OF_DAY "Czas"
 #define D_TO "do"
 #define D_TOGGLE "Przełącz"
 #define D_TOPIC "Temat"
@@ -195,6 +197,7 @@
 #define D_TWILIGHT_ASTRONOMICAL "Astronomiczny"
 #define D_TWILIGHT_CIVIL "Cywilny"
 #define D_TWILIGHT_NAUTICAL "Morski"
+#define D_UNSUBSCRIBE_FROM "Nie subskrybuj"
 #define D_UPLOAD "Wgraj"
 #define D_UPTIME "Czas pracy"
 #define D_USED "użyte"
@@ -214,12 +217,10 @@
 #define D_VOC "VOC"
 #define D_VOLTAGE "Napięcie"
 #define D_VOLUME "Pojemność"
-#define D_WEIGHT "Waga"
 #define D_WARMLIGHT "Temperatura światła"
-#define D_WEB_SERVER "Serwer Web"
-#define D_SOC "Stan naładowania"
-#define D_SOH "Kondycja"
 #define D_WATER_DEPTH "Głębokość wody"
+#define D_WEB_SERVER "Serwer Web"
+#define D_WEIGHT "Waga"
 
 // tasmota.ino
 #define D_WARNING_MINIMAL_VERSION "UWAGA Ta wersja nie obsługuje zapisu ustawień"
@@ -474,7 +475,6 @@
 #define D_TIMER_PARAMETERS "Parametry harmonogramu"
 #define D_TIMER_ENABLE "Załącz harmonogram"
 #define D_TIMER_ARM "Załącz"
-#define D_TIMER_TIME "Czas"
 #define D_TIMER_DAYS "Dni"
 #define D_TIMER_REPEAT "Powtarzaj"
 #define D_TIMER_OUTPUT "Wyjście"
diff --git a/tasmota/language/pt_BR.h b/tasmota/language/pt_BR.h
index e650d0b20..317992dfc 100644
--- a/tasmota/language/pt_BR.h
+++ b/tasmota/language/pt_BR.h
@@ -60,8 +60,8 @@
 #define D_AT "at"
 #define D_AUTO "Auto"
 #define D_AUTO_UPDATE "Auto Update"
-#define D_BATTERY "Battery"
 #define D_BATT "Bat"                // Short for Battery
+#define D_BATTERY "Battery"
 #define D_BATTERY_CHARGE "Charge"  // Battery charge in %
 #define D_BLINK "Piscar"
 #define D_BLINKOFF "Piscar desligado"
@@ -76,17 +76,17 @@
 #define D_CO2 "CO₂"
 #define D_CODE "Código"                // Button code
 #define D_COLDLIGHT "Luz fria"
+#define D_COLOR "Color"
 #define D_COMMAND "Comando"
 #define D_CONNECTED "Ligado"
 #define D_CORS_DOMAIN "Domínio CORS"
-#define D_COLOR "Color"
 #define D_COUNT "Contagem"
 #define D_COUNTER "Contador"
 #define D_CT_POWER "Carga CT"
 #define D_CURRENT "Corrente"          // As in Voltage and Current
 #define D_CURRENT_NEUTRAL "Current Neutral"
-#define D_DATA "Dados"
 #define D_DARKLIGHT "Luz escura"
+#define D_DATA "Dados"
 #define D_DEBUG "Depurar"
 #define D_DEWPOINT "Ponto de orvalho"
 #define D_DISABLED "Desabilitado"
@@ -113,15 +113,13 @@
 #define D_FRAGMENTATION "frag."      // Lower case abbreviated version of fragmentation used in "memory fragmentation"
 #define D_FRAME_RATE "Frame rate"
 #define D_FREE_MEMORY "Memória livre"
-#define D_PSR_MAX_MEMORY "Memória PS-RAM"
-#define D_PSR_FREE_MEMORY "Memória PS-RAM livre"
 #define D_FREQUENCY "Frequência"
 #define D_GAS "Gás"
 #define D_GATEWAY "Gateway"
 #define D_GROUP "Grupo"
-#define D_HOST "Host"
 #define D_HALL_EFFECT "Efeito Hall"
 #define D_HEATINDEX "Heat index"
+#define D_HOST "Host"
 #define D_HOSTNAME "Nome do Host"
 #define D_HUMIDITY "Umidade"
 #define D_ILLUMINANCE "Luminância"
@@ -132,10 +130,11 @@
 #define D_INITIALIZED "Inicializado"
 #define D_IP_ADDRESS "Endereço IP"
 #define D_LIGHT "Luz"
-#define D_LWT "LWT"
 #define D_LQI "LQI"                  // Zigbee Link Quality Index
+#define D_LWT "LWT"
 #define D_MODULE "Módulo"
 #define D_MOISTURE "Umidade"
+#define D_MQ "MQ"
 #define D_MQTT "MQTT"
 #define D_MULTI_PRESS "multi-pressão"
 #define D_NOISE "Ruído"
@@ -148,10 +147,9 @@
 #define D_ON "Ligado"
 #define D_ONLINE "Conectado"
 #define D_ORP "ORP"
+#define D_PARTITION "Partition"      // As in flash and firmware partition
 #define D_PASSWORD "Senha"
 #define D_PH "pH"
-#define D_MQ "MQ"
-#define D_PARTITION "Partition"      // As in flash and firmware partition
 #define D_PORT "Porta"
 #define D_POWER_FACTOR "Fator de potência"
 #define D_POWERUSAGE "Potência"
@@ -164,27 +162,31 @@
 #define D_PROGRAM_FLASH_SIZE "Tamanho do programa na memória"
 #define D_PROGRAM_SIZE "Tamanho do programa"
 #define D_PROJECT "Projeto"
+#define D_PSR_FREE_MEMORY "Memória PS-RAM livre"
+#define D_PSR_MAX_MEMORY "Memória PS-RAM"
 #define D_RAIN "Chuva"
 #define D_RANGE "Alcance"
 #define D_RECEIVED "Recebido"
 #define D_RESTART "Reiniciar"
-#define D_RESTARTING "Reiniciando"
 #define D_RESTART_REASON "Motivo do reinício"
+#define D_RESTARTING "Reiniciando"
 #define D_RETAINED "Manter"
 #define D_RULE "Regra"
 #define D_SAVE "Salvar"
 #define D_SENSOR "Sensor"
+#define D_SOC "Estado de Carga"
+#define D_SOH "Estado de Saúde"
 #define D_SSID "SSId"
 #define D_START "Iniciar"
 #define D_STD_TIME "STD"
 #define D_STOP "Parar"
 #define D_SUBNET_MASK "Máscara sub rede"
 #define D_SUBSCRIBE_TO "Inscrever para"
-#define D_UNSUBSCRIBE_FROM "Desinscrever de"
 #define D_SUCCESSFUL "Successo"
 #define D_SUNRISE "Nascer do sol"
 #define D_SUNSET "Por do sol"
 #define D_TEMPERATURE "Temperatura"
+#define D_TIME_OF_DAY "Horário"
 #define D_TO "Para"
 #define D_TOGGLE "Inverter"
 #define D_TOPIC "Tópico"
@@ -195,6 +197,7 @@
 #define D_TWILIGHT_ASTRONOMICAL "Astronomical"
 #define D_TWILIGHT_CIVIL "Civil"
 #define D_TWILIGHT_NAUTICAL "Nautical"
+#define D_UNSUBSCRIBE_FROM "Desinscrever de"
 #define D_UPLOAD "Enviar"
 #define D_UPTIME "Tempo de atividade"
 #define D_USED "used"
@@ -214,12 +217,10 @@
 #define D_VOC "VOC"
 #define D_VOLTAGE "Voltagem"
 #define D_VOLUME "Volume"
-#define D_WEIGHT "Peso"
 #define D_WARMLIGHT "Luz quente"
-#define D_WEB_SERVER "Servidor WEB"
-#define D_SOC "Estado de Carga"
-#define D_SOH "Estado de Saúde"
 #define D_WATER_DEPTH "Profundidade da água"
+#define D_WEB_SERVER "Servidor WEB"
+#define D_WEIGHT "Peso"
 
 // tasmota.ino
 #define D_WARNING_MINIMAL_VERSION "AVISO: esta versão não supporta configurações persistentes"
@@ -474,7 +475,6 @@
 #define D_TIMER_PARAMETERS "Parâmetros"
 #define D_TIMER_ENABLE "Habilitar temporizadores"
 #define D_TIMER_ARM "Habilitar"
-#define D_TIMER_TIME "Horário"
 #define D_TIMER_DAYS "Dias"
 #define D_TIMER_REPEAT "Repetir"
 #define D_TIMER_OUTPUT "Saída"
diff --git a/tasmota/language/pt_PT.h b/tasmota/language/pt_PT.h
index 1c53fb4cb..d9448ba08 100644
--- a/tasmota/language/pt_PT.h
+++ b/tasmota/language/pt_PT.h
@@ -60,8 +60,8 @@
 #define D_AT "at"
 #define D_AUTO "AUTO"
 #define D_AUTO_UPDATE "Auto Update"
-#define D_BATTERY "Battery"
 #define D_BATT "Batt"                // Short for Battery
+#define D_BATTERY "Battery"
 #define D_BATTERY_CHARGE "Charge"   // Battery charge in %
 #define D_BLINK "Piscar"
 #define D_BLINKOFF "Piscar Desligado"
@@ -76,17 +76,17 @@
 #define D_CO2 "Dioxido de Carbono"
 #define D_CODE "Código"                // Button code
 #define D_COLDLIGHT "Luz Fria"
+#define D_COLOR "Color"
 #define D_COMMAND "Comando"
 #define D_CONNECTED "Ligado"
 #define D_CORS_DOMAIN "CORS Domain"
-#define D_COLOR "Color"
 #define D_COUNT "Contagem"
 #define D_COUNTER "Contador"
 #define D_CT_POWER "CT Power"
 #define D_CURRENT "Corrente"          // As in Voltage and Current
 #define D_CURRENT_NEUTRAL "Corrente Neutra"
-#define D_DATA "Dados"
 #define D_DARKLIGHT "Luz Escura"
+#define D_DATA "Dados"
 #define D_DEBUG "Depurar"
 #define D_DEWPOINT "Ponto de Condensação"
 #define D_DISABLED "Disabilitado"
@@ -113,15 +113,13 @@
 #define D_FRAGMENTATION "frag."      // Lower case abbreviated version of fragmentation used in "memory fragmentation"
 #define D_FRAME_RATE "Frame rate"
 #define D_FREE_MEMORY "Memória Livre"
-#define D_PSR_MAX_MEMORY "PS-RAM Memory"
-#define D_PSR_FREE_MEMORY "PS-RAM free Memory"
 #define D_FREQUENCY "Frequência"
 #define D_GAS "Gás"
 #define D_GATEWAY "Gateway"
 #define D_GROUP "Grupo"
-#define D_HOST "Anfitrião"
 #define D_HALL_EFFECT "Hall Effect"
 #define D_HEATINDEX "Heat index"
+#define D_HOST "Anfitrião"
 #define D_HOSTNAME "Nome Anfitrião"
 #define D_HUMIDITY "Humidade"
 #define D_ILLUMINANCE "Luminâcia"
@@ -132,10 +130,11 @@
 #define D_INITIALIZED "Inicializado"
 #define D_IP_ADDRESS "Endereço IP"
 #define D_LIGHT "Luz"
-#define D_LWT "LWT"
 #define D_LQI "LQI"                  // Zigbee Link Quality Index
+#define D_LWT "LWT"
 #define D_MODULE "Módulo"
 #define D_MOISTURE "Moisture"
+#define D_MQ "MQ"
 #define D_MQTT "MQTT"
 #define D_MULTI_PRESS "multi-pressão"
 #define D_NOISE "Ruído"
@@ -148,10 +147,9 @@
 #define D_ON "On"
 #define D_ONLINE "Conetado"
 #define D_ORP "ORP"
+#define D_PARTITION "Partição"      // As in flash and firmware partition
 #define D_PASSWORD "Palavra-passe"
 #define D_PH "pH"
-#define D_MQ "MQ"
-#define D_PARTITION "Partição"      // As in flash and firmware partition
 #define D_PORT "Porta"
 #define D_POWER_FACTOR "Factor de Potência"
 #define D_POWERUSAGE "Potência"
@@ -164,27 +162,31 @@
 #define D_PROGRAM_FLASH_SIZE "Tamanho do Programa na Flash"
 #define D_PROGRAM_SIZE "Tamanho do Programa"
 #define D_PROJECT "Projeto"
+#define D_PSR_FREE_MEMORY "PS-RAM free Memory"
+#define D_PSR_MAX_MEMORY "PS-RAM Memory"
 #define D_RAIN "Chuva"
 #define D_RANGE "Range"
 #define D_RECEIVED "Recebido"
 #define D_RESTART "Reiniciar"
-#define D_RESTARTING "A reiniciar"
 #define D_RESTART_REASON "Razão do reinicio"
+#define D_RESTARTING "A reiniciar"
 #define D_RETAINED "Manter"
 #define D_RULE "Regra"
 #define D_SAVE "Guardar"
 #define D_SENSOR "Sensor"
+#define D_SOC "Estado de Carga"
+#define D_SOH "Estado de Saúde"
 #define D_SSID "SSId"
 #define D_START "Início"
 #define D_STD_TIME "STD"
 #define D_STOP "Parar"
 #define D_SUBNET_MASK "Mascara sub-rede"
 #define D_SUBSCRIBE_TO "Subscrever"
-#define D_UNSUBSCRIBE_FROM "Cancelar subscrição de"
 #define D_SUCCESSFUL "Successo"
 #define D_SUNRISE "Nascer do Sol"
 #define D_SUNSET "Pôr do Sol"
 #define D_TEMPERATURE "Temperatura"
+#define D_TIME_OF_DAY "Tempo"
 #define D_TO "para"
 #define D_TOGGLE "Pressionar"
 #define D_TOPIC "Tópico"
@@ -195,6 +197,7 @@
 #define D_TWILIGHT_ASTRONOMICAL "Astronomical"
 #define D_TWILIGHT_CIVIL "Civil"
 #define D_TWILIGHT_NAUTICAL "Nautical"
+#define D_UNSUBSCRIBE_FROM "Cancelar subscrição de"
 #define D_UPLOAD "Enviar"
 #define D_UPTIME "Tempo de Atividade"
 #define D_USED "used"
@@ -214,12 +217,10 @@
 #define D_VOC "VOC"
 #define D_VOLTAGE "Voltagem"
 #define D_VOLUME "Volume"
-#define D_WEIGHT "Peso"
 #define D_WARMLIGHT "Luz Quente"
-#define D_WEB_SERVER "Servidor WEB"
-#define D_SOC "Estado de Carga"
-#define D_SOH "Estado de Saúde"
 #define D_WATER_DEPTH "Profundidade da água"
+#define D_WEB_SERVER "Servidor WEB"
+#define D_WEIGHT "Peso"
 
 // tasmota.ino
 #define D_WARNING_MINIMAL_VERSION "AVISO esta versão não supporta configurações persistentes"
@@ -474,7 +475,6 @@
 #define D_TIMER_PARAMETERS "Parâmetros do temporizador"
 #define D_TIMER_ENABLE "Habilitar Temporizadores"
 #define D_TIMER_ARM "Armar"
-#define D_TIMER_TIME "Tempo"
 #define D_TIMER_DAYS "Dias"
 #define D_TIMER_REPEAT "Repetir"
 #define D_TIMER_OUTPUT "Saída"
diff --git a/tasmota/language/ro_RO.h b/tasmota/language/ro_RO.h
index cd7abdd2b..1e88dc2a0 100644
--- a/tasmota/language/ro_RO.h
+++ b/tasmota/language/ro_RO.h
@@ -60,8 +60,8 @@
 #define D_AT "at"
 #define D_AUTO "AUTO"
 #define D_AUTO_UPDATE "Auto Update"
-#define D_BATTERY "Battery"
 #define D_BATT "Batt"                // Short for Battery
+#define D_BATTERY "Battery"
 #define D_BATTERY_CHARGE "Charge"   // Battery charge in %
 #define D_BLINK "Blink"
 #define D_BLINKOFF "BlinkOff"
@@ -76,17 +76,17 @@
 #define D_CO2 "Dioxid de carbon"
 #define D_CODE "cod"                // Button code
 #define D_COLDLIGHT "Rece"
+#define D_COLOR "Color"
 #define D_COMMAND "Comandă"
 #define D_CONNECTED "Conectat"
 #define D_CORS_DOMAIN "Domeniu CORS"
-#define D_COLOR "Color"
 #define D_COUNT "Numărătoare"
 #define D_COUNTER "Contor"
 #define D_CT_POWER "Putere Transformată"
 #define D_CURRENT "Curent"          // As in Voltage and Current
 #define D_CURRENT_NEUTRAL "Current Neutral"
-#define D_DATA "Date"
 #define D_DARKLIGHT "Întunecat"
+#define D_DATA "Date"
 #define D_DEBUG "Depanare"
 #define D_DEWPOINT "Punct de rouă"
 #define D_DISABLED "Dezactivat"
@@ -113,15 +113,13 @@
 #define D_FRAGMENTATION "frag."      // Lower case abbreviated version of fragmentation used in "memory fragmentation"
 #define D_FRAME_RATE "Frame rate"
 #define D_FREE_MEMORY "Memorie Liberă"
-#define D_PSR_MAX_MEMORY "PS-RAM Memory"
-#define D_PSR_FREE_MEMORY "PS-RAM free Memory"
 #define D_FREQUENCY "Frecvență"
 #define D_GAS "Gaz"
 #define D_GATEWAY "Gateway"
 #define D_GROUP "Grup"
-#define D_HOST "Gazdă"
 #define D_HALL_EFFECT "Hall Effect"
 #define D_HEATINDEX "Heat index"
+#define D_HOST "Gazdă"
 #define D_HOSTNAME "Hostname"
 #define D_HUMIDITY "Umiditate"
 #define D_ILLUMINANCE "Iluminare"
@@ -132,10 +130,11 @@
 #define D_INITIALIZED "Inițializat"
 #define D_IP_ADDRESS "Adresă IP"
 #define D_LIGHT "Lumină"
-#define D_LWT "LWT"
 #define D_LQI "LQI"                  // Zigbee Link Quality Index
+#define D_LWT "LWT"
 #define D_MODULE "Modul"
 #define D_MOISTURE "Umezeală"
+#define D_MQ "MQ"
 #define D_MQTT "MQTT"
 #define D_MULTI_PRESS "selectare multiplă"
 #define D_NOISE "Zgomot"
@@ -148,10 +147,9 @@
 #define D_ON "Aprins"
 #define D_ONLINE "Online"
 #define D_ORP "ORP"
+#define D_PARTITION "Partition"      // As in flash and firmware partition
 #define D_PASSWORD "Parolă"
 #define D_PH "pH"
-#define D_MQ "MQ"
-#define D_PARTITION "Partition"      // As in flash and firmware partition
 #define D_PORT "Port"
 #define D_POWER_FACTOR "Factor de Putere"
 #define D_POWERUSAGE "Putere"
@@ -164,27 +162,31 @@
 #define D_PROGRAM_FLASH_SIZE "Mărimea Programului Flash"
 #define D_PROGRAM_SIZE "Mărimea Programului"
 #define D_PROJECT "Proiect"
+#define D_PSR_FREE_MEMORY "PS-RAM free Memory"
+#define D_PSR_MAX_MEMORY "PS-RAM Memory"
 #define D_RAIN "Ploaie"
 #define D_RANGE "Distanță"
 #define D_RECEIVED "Primit"
 #define D_RESTART "Restart"
-#define D_RESTARTING "Restartare"
 #define D_RESTART_REASON "Motiv Restartare"
+#define D_RESTARTING "Restartare"
 #define D_RETAINED "Păstrare"
 #define D_RULE "Regulă"
 #define D_SAVE "Salvare"
 #define D_SENSOR "Senzor"
+#define D_SOC "State of Charge"
+#define D_SOH "State of Health"
 #define D_SSID "SSId"
 #define D_START "Start"
 #define D_STD_TIME "STD"
 #define D_STOP "Stop"
 #define D_SUBNET_MASK "Subnet Mask"
 #define D_SUBSCRIBE_TO "Înscriere la"
-#define D_UNSUBSCRIBE_FROM "Renunțare de la"
 #define D_SUCCESSFUL "Succes"
 #define D_SUNRISE "Răsărit"
 #define D_SUNSET "Apus"
 #define D_TEMPERATURE "Temperatură"
+#define D_TIME_OF_DAY "Timp"
 #define D_TO "la"
 #define D_TOGGLE "Comută"
 #define D_TOPIC "Topic"
@@ -195,6 +197,7 @@
 #define D_TWILIGHT_ASTRONOMICAL "Astronomical"
 #define D_TWILIGHT_CIVIL "Civil"
 #define D_TWILIGHT_NAUTICAL "Nautical"
+#define D_UNSUBSCRIBE_FROM "Renunțare de la"
 #define D_UPLOAD "Încărcăre"
 #define D_UPTIME "Folosință"
 #define D_USED "used"
@@ -214,12 +217,10 @@
 #define D_VOC "VOC"
 #define D_VOLTAGE "Voltaj"
 #define D_VOLUME "Volume"
-#define D_WEIGHT "Greutate"
 #define D_WARMLIGHT "Cald"
-#define D_WEB_SERVER "Server Web"
-#define D_SOC "State of Charge"
-#define D_SOH "State of Health"
 #define D_WATER_DEPTH "Adâncimea apei"
+#define D_WEB_SERVER "Server Web"
+#define D_WEIGHT "Greutate"
 
 // tasmota.ino
 #define D_WARNING_MINIMAL_VERSION "ATENȚIE Această versiune nu suportă setări permanente"
@@ -474,7 +475,6 @@
 #define D_TIMER_PARAMETERS "Parameteri Temporizare"
 #define D_TIMER_ENABLE "Activează Temporizare"
 #define D_TIMER_ARM "Arm"
-#define D_TIMER_TIME "Timp"
 #define D_TIMER_DAYS "Zile"
 #define D_TIMER_REPEAT "Repetă"
 #define D_TIMER_OUTPUT "Ieșire"
diff --git a/tasmota/language/ru_RU.h b/tasmota/language/ru_RU.h
index 9ab9538e1..fc8de49a7 100644
--- a/tasmota/language/ru_RU.h
+++ b/tasmota/language/ru_RU.h
@@ -61,8 +61,8 @@
 #define D_AT "at"
 #define D_AUTO "АВТО"
 #define D_AUTO_UPDATE "Auto Update"
-#define D_BATTERY "Battery"
 #define D_BATT "Batt"                // Short for Battery
+#define D_BATTERY "Battery"
 #define D_BATTERY_CHARGE "Charge"   // Battery charge in %
 #define D_BLINK "Мигать"
 #define D_BLINKOFF "Не Мигать"
@@ -77,17 +77,17 @@
 #define D_CO2 "Углекислый газ"
 #define D_CODE "код"                // Button code
 #define D_COLDLIGHT "Холодный"
+#define D_COLOR "Color"
 #define D_COMMAND "Команда"
 #define D_CONNECTED "Соединен"
 #define D_CORS_DOMAIN "Домен CORS"
-#define D_COLOR "Color"
 #define D_COUNT "Подсчет"
 #define D_COUNTER "Счетчик"
 #define D_CT_POWER "CT Power"
 #define D_CURRENT "Ток"          // As in Voltage and Current
 #define D_CURRENT_NEUTRAL "Current Neutral"
-#define D_DATA "Данные"
 #define D_DARKLIGHT "Темный"
+#define D_DATA "Данные"
 #define D_DEBUG "Отладка"
 #define D_DEWPOINT "Dew point"
 #define D_DISABLED "Блокирован"
@@ -114,15 +114,13 @@
 #define D_FRAGMENTATION "фраг."      // Lower case abbreviated version of fragmentation used in "memory fragmentation"
 #define D_FRAME_RATE "Частота кадров"
 #define D_FREE_MEMORY "Свободная память"
-#define D_PSR_MAX_MEMORY "Память PS-RAM"
-#define D_PSR_FREE_MEMORY "Свободная память PS-RAM"
 #define D_FREQUENCY "Частота"
 #define D_GAS "Газ"
 #define D_GATEWAY "Шлюз"
 #define D_GROUP "Группа"
-#define D_HOST "Хост"
 #define D_HALL_EFFECT "Hall Effect"
 #define D_HEATINDEX "Heat index"
+#define D_HOST "Хост"
 #define D_HOSTNAME "Имя хоста"
 #define D_HUMIDITY "Влажность"
 #define D_ILLUMINANCE "Освещенность"
@@ -133,10 +131,11 @@
 #define D_INITIALIZED "Инициализировано"
 #define D_IP_ADDRESS "IP Адрес"
 #define D_LIGHT "Свет"
-#define D_LWT "LWT"
 #define D_LQI "LQI"                  // Zigbee Link Quality Index
+#define D_LWT "LWT"
 #define D_MODULE "Модуль"
 #define D_MOISTURE "Влага"
+#define D_MQ "MQ"
 #define D_MQTT "MQTT"
 #define D_MULTI_PRESS "многократное нажатие"
 #define D_NOISE "Шум"
@@ -149,10 +148,9 @@
 #define D_ON "Вкл"
 #define D_ONLINE "Онлайн"
 #define D_ORP "ORP"
+#define D_PARTITION "Раздел"      // As in flash and firmware partition
 #define D_PASSWORD "Пароль"
 #define D_PH "pH"
-#define D_MQ "MQ"
-#define D_PARTITION "Раздел"      // As in flash and firmware partition
 #define D_PORT "Порт"
 #define D_POWER_FACTOR "Коэффициент мощности"
 #define D_POWERUSAGE "Мощность"
@@ -165,27 +163,31 @@
 #define D_PROGRAM_FLASH_SIZE "Размер Flash для программ"
 #define D_PROGRAM_SIZE "Размер программы "
 #define D_PROJECT "Проект"
+#define D_PSR_FREE_MEMORY "Свободная память PS-RAM"
+#define D_PSR_MAX_MEMORY "Память PS-RAM"
 #define D_RAIN "Дождь"
 #define D_RANGE "Диапазон"
 #define D_RECEIVED "Получено"
 #define D_RESTART "Перезагрузка"
-#define D_RESTARTING "Перезагрузка"
 #define D_RESTART_REASON "Причина перезагрузки"
+#define D_RESTARTING "Перезагрузка"
 #define D_RETAINED "нераспред."
 #define D_RULE "Правило"
 #define D_SAVE "Сохранить"
 #define D_SENSOR "Датчик"
+#define D_SOC "State of Charge"
+#define D_SOH "State of Health"
 #define D_SSID "SSID"
 #define D_START "Старт"
 #define D_STD_TIME "STD"
 #define D_STOP "Стоп"
 #define D_SUBNET_MASK "Маска подсети"
 #define D_SUBSCRIBE_TO "Подписаться на"
-#define D_UNSUBSCRIBE_FROM "Отписатся от"
 #define D_SUCCESSFUL "Успешно"
 #define D_SUNRISE "Восход"
 #define D_SUNSET "Закат"
 #define D_TEMPERATURE "Температура"
+#define D_TIME_OF_DAY "Время"
 #define D_TO "до"
 #define D_TOGGLE "Переключить"
 #define D_TOPIC "Топик"
@@ -196,6 +198,7 @@
 #define D_TWILIGHT_ASTRONOMICAL "Astronomical"
 #define D_TWILIGHT_CIVIL "Civil"
 #define D_TWILIGHT_NAUTICAL "Nautical"
+#define D_UNSUBSCRIBE_FROM "Отписатся от"
 #define D_UPLOAD "Загрузить"
 #define D_UPTIME "Аптайм"
 #define D_USED "использовано"
@@ -215,12 +218,10 @@
 #define D_VOC "VOC"
 #define D_VOLTAGE "Напряжение"
 #define D_VOLUME "Громкость"
-#define D_WEIGHT "Вес"
 #define D_WARMLIGHT "Тёплый"
-#define D_WEB_SERVER "Веб-сервер"
-#define D_SOC "State of Charge"
-#define D_SOH "State of Health"
 #define D_WATER_DEPTH "Глубина воды"
+#define D_WEB_SERVER "Веб-сервер"
+#define D_WEIGHT "Вес"
 
 // tasmota.ino
 #define D_WARNING_MINIMAL_VERSION "ПРЕДУПРЕЖДЕНИЕ Эта версия не поддерживает персистентные настройки"
@@ -475,7 +476,6 @@
 #define D_TIMER_PARAMETERS "Настройки таймера"
 #define D_TIMER_ENABLE "Включить таймеры"
 #define D_TIMER_ARM "Включить"
-#define D_TIMER_TIME "Время"
 #define D_TIMER_DAYS "Дни"
 #define D_TIMER_REPEAT "Повторять"
 #define D_TIMER_OUTPUT "Выход"
diff --git a/tasmota/language/sk_SK.h b/tasmota/language/sk_SK.h
index c94817cdc..ab0239c80 100644
--- a/tasmota/language/sk_SK.h
+++ b/tasmota/language/sk_SK.h
@@ -60,8 +60,8 @@
 #define D_AT "at"
 #define D_AUTO "AUTO"
 #define D_AUTO_UPDATE "Auto Update"
-#define D_BATTERY "Battery"
 #define D_BATT "Batt"                // Short for Battery
+#define D_BATTERY "Battery"
 #define D_BATTERY_CHARGE "Charge"   // Battery charge in %
 #define D_BLINK "Blikanie"
 #define D_BLINKOFF "BlikanieVyp"
@@ -76,19 +76,17 @@
 #define D_CO2 "CO2"
 #define D_CODE "kód"                 // Button code
 #define D_COLDLIGHT "Studené svetlo"
+#define D_COLOR "Color"
 #define D_COMMAND "Príkaz"
 #define D_CONNECTED "...pripojené"
 #define D_CORS_DOMAIN "CORS Domain"
-#define D_COLOR "Color"
 #define D_COUNT "Počítaj"
 #define D_COUNTER "Počítadlo"
 #define D_CT_POWER "CT Power"
 #define D_CURRENT "Prúd"          // As in Voltage and Current
 #define D_CURRENT_NEUTRAL "Current Neutral"
-#define D_DATA "Dáta"
-#define D_FILE_SYSTEM_SIZE "File System Size"
-#define D_FLOW_RATE "Flow rate"
 #define D_DARKLIGHT "Tmavý"
+#define D_DATA "Dáta"
 #define D_DEBUG "Debug"
 #define D_DEWPOINT "Dew point"
 #define D_DISABLED "Zablokované"
@@ -110,18 +108,18 @@
 #define D_FALLBACK_TOPIC "Záložný topic"
 #define D_FALSE "Nepravda"
 #define D_FILE "Súbor"
+#define D_FILE_SYSTEM_SIZE "File System Size"
+#define D_FLOW_RATE "Flow rate"
 #define D_FRAGMENTATION "frag."      // Lower case abbreviated version of fragmentation used in "memory fragmentation"
 #define D_FRAME_RATE "Frame rate"
 #define D_FREE_MEMORY "Voľná pamäť"
-#define D_PSR_MAX_MEMORY "PS-RAM Memory"
-#define D_PSR_FREE_MEMORY "PS-RAM free Memory"
 #define D_FREQUENCY "Frekvencia"
 #define D_GAS "Plyn"
 #define D_GATEWAY "Predvolená brána"
 #define D_GROUP "Skupina"
-#define D_HOST "Server"
 #define D_HALL_EFFECT "Hall Effect"
 #define D_HEATINDEX "Heat index"
+#define D_HOST "Server"
 #define D_HOSTNAME "Názov servera"
 #define D_HUMIDITY "Vlhkosť"
 #define D_ILLUMINANCE "Osvetlenie"
@@ -132,10 +130,11 @@
 #define D_INITIALIZED "Inicializovaný"
 #define D_IP_ADDRESS "Adresa IP"
 #define D_LIGHT "Svetlo"
-#define D_LWT "LWT"
 #define D_LQI "LQI"                  // Zigbee Link Quality Index
+#define D_LWT "LWT"
 #define D_MODULE "Modul"
 #define D_MOISTURE "Moisture"
+#define D_MQ "MQ"
 #define D_MQTT "MQTT"
 #define D_MULTI_PRESS "multi-stlačenie"
 #define D_NOISE "Hluk"
@@ -148,10 +147,9 @@
 #define D_ON "Zap."
 #define D_ONLINE "Aktívny"
 #define D_ORP "ORP"
+#define D_PARTITION "Partition"      // As in flash and firmware partition
 #define D_PASSWORD "Heslo"
 #define D_PH "pH"
-#define D_MQ "MQ"
-#define D_PARTITION "Partition"      // As in flash and firmware partition
 #define D_PORT "Port"
 #define D_POWER_FACTOR "Účinník"
 #define D_POWERUSAGE "Príkon"
@@ -164,27 +162,31 @@
 #define D_PROGRAM_FLASH_SIZE "Veľkosť flash pamäte"
 #define D_PROGRAM_SIZE "Veľkosť programu"
 #define D_PROJECT "Projekt"
+#define D_PSR_FREE_MEMORY "PS-RAM free Memory"
+#define D_PSR_MAX_MEMORY "PS-RAM Memory"
 #define D_RAIN "Dážď"
 #define D_RANGE "Range"
 #define D_RECEIVED "Prijatý"
 #define D_RESTART "Reštart"
-#define D_RESTARTING "Reštartuje sa"
 #define D_RESTART_REASON "Príčina reštartu"
+#define D_RESTARTING "Reštartuje sa"
 #define D_RETAINED "Zachované"
 #define D_RULE "Pravidlo"
 #define D_SAVE "Ulož"
 #define D_SENSOR "Senzor"
+#define D_SOC "State of Charge"
+#define D_SOH "State of Health"
 #define D_SSID "SSID"
 #define D_START "Spustiť"
 #define D_STD_TIME "STD"
 #define D_STOP "Stop"
 #define D_SUBNET_MASK "Maska podsiete"
 #define D_SUBSCRIBE_TO "Prihlásiť do"
-#define D_UNSUBSCRIBE_FROM "Unsubscribe from"
 #define D_SUCCESSFUL "úspešné."
 #define D_SUNRISE "Svitanie"
 #define D_SUNSET "Súmrak"
 #define D_TEMPERATURE "Teplota"
+#define D_TIME_OF_DAY "Čas"
 #define D_TO "do"
 #define D_TOGGLE "Prepni"
 #define D_TOPIC "Topic"
@@ -195,6 +197,7 @@
 #define D_TWILIGHT_ASTRONOMICAL "Astronomical"
 #define D_TWILIGHT_CIVIL "Civil"
 #define D_TWILIGHT_NAUTICAL "Nautical"
+#define D_UNSUBSCRIBE_FROM "Unsubscribe from"
 #define D_UPLOAD "Nahrávanie..."
 #define D_UPTIME "Uptime"
 #define D_USED "used"
@@ -214,12 +217,10 @@
 #define D_VOC "VOC"
 #define D_VOLTAGE "Napätie"
 #define D_VOLUME "Volume"
-#define D_WEIGHT "Hmotnosť"
 #define D_WARMLIGHT "Teplé svetlo"
-#define D_WEB_SERVER "Web Server"
-#define D_SOC "State of Charge"
-#define D_SOH "State of Health"
 #define D_WATER_DEPTH "Hĺbka vody"
+#define D_WEB_SERVER "Web Server"
+#define D_WEIGHT "Hmotnosť"
 
 // tasmota.ino
 #define D_WARNING_MINIMAL_VERSION "UPOZORNENIE Táto verzia nepodporuje trvalé nastavenia"
@@ -474,7 +475,6 @@
 #define D_TIMER_PARAMETERS "Časovač"
 #define D_TIMER_ENABLE "Povoľ časovače"
 #define D_TIMER_ARM "Aktívne"
-#define D_TIMER_TIME "Čas"
 #define D_TIMER_DAYS "Dni"
 #define D_TIMER_REPEAT "Opakovať"
 #define D_TIMER_OUTPUT "Výstup"
diff --git a/tasmota/language/sv_SE.h b/tasmota/language/sv_SE.h
index 948d6fe0c..d97fb9f51 100644
--- a/tasmota/language/sv_SE.h
+++ b/tasmota/language/sv_SE.h
@@ -60,8 +60,8 @@
 #define D_AT "at"
 #define D_AUTO "AUTO"
 #define D_AUTO_UPDATE "Auto Update"
-#define D_BATTERY "Battery"
 #define D_BATT "Batt"                // Short for Battery
+#define D_BATTERY "Battery"
 #define D_BATTERY_CHARGE "Charge"   // Battery charge in %
 #define D_BLINK "Blinka"
 #define D_BLINKOFF "BlinkaAv"
@@ -76,17 +76,17 @@
 #define D_CO2 "Koldioxid"
 #define D_CODE "kod"                // Button code
 #define D_COLDLIGHT "Kallt"
+#define D_COLOR "Color"
 #define D_COMMAND "Kommando"
 #define D_CONNECTED "Ansluten"
 #define D_CORS_DOMAIN "CORS Domain"
-#define D_COLOR "Color"
 #define D_COUNT "Räkna"
 #define D_COUNTER "Räknare"
 #define D_CT_POWER "CT Power"
 #define D_CURRENT "Ström"          // As in Voltage and Current
 #define D_CURRENT_NEUTRAL "Current Neutral"
-#define D_DATA "Data"
 #define D_DARKLIGHT "Mörkt"
+#define D_DATA "Data"
 #define D_DEBUG "Debug"
 #define D_DEWPOINT "Dew point"
 #define D_DISABLED "Inaktiverad"
@@ -113,15 +113,13 @@
 #define D_FRAGMENTATION "frag."      // Lower case abbreviated version of fragmentation used in "memory fragmentation"
 #define D_FRAME_RATE "Frame rate"
 #define D_FREE_MEMORY "Ledigt minne"
-#define D_PSR_MAX_MEMORY "PS-RAM Memory"
-#define D_PSR_FREE_MEMORY "PS-RAM free Memory"
 #define D_FREQUENCY "Frekvens"
 #define D_GAS "Gas"
 #define D_GATEWAY "Gateway"
 #define D_GROUP "Grupp"
-#define D_HOST "Värd"
 #define D_HALL_EFFECT "Hall Effect"
 #define D_HEATINDEX "Heat index"
+#define D_HOST "Värd"
 #define D_HOSTNAME "Värdnamn"
 #define D_HUMIDITY "Fuktighet"
 #define D_ILLUMINANCE "Belysnings"
@@ -132,10 +130,11 @@
 #define D_INITIALIZED "Initialiserad"
 #define D_IP_ADDRESS "IP-adress"
 #define D_LIGHT "Ljus"
-#define D_LWT "LWT"
 #define D_LQI "LQI"                  // Zigbee Link Quality Index
+#define D_LWT "LWT"
 #define D_MODULE "Modul"
 #define D_MOISTURE "Moisture"
+#define D_MQ "MQ"
 #define D_MQTT "MQTT"
 #define D_MULTI_PRESS "fler tryck"
 #define D_NOISE "Oväsen"
@@ -148,10 +147,9 @@
 #define D_ON "På"
 #define D_ONLINE "Ansluten"
 #define D_ORP "ORP"
+#define D_PARTITION "Partition"      // As in flash and firmware partition
 #define D_PASSWORD "Lösenord"
 #define D_PH "pH"
-#define D_MQ "MQ"
-#define D_PARTITION "Partition"      // As in flash and firmware partition
 #define D_PORT "Port"
 #define D_POWER_FACTOR "Spänningsfaktor"
 #define D_POWERUSAGE "Spänning"
@@ -164,27 +162,31 @@
 #define D_PROGRAM_FLASH_SIZE "Program-flashstorlek"
 #define D_PROGRAM_SIZE "Programstorlek"
 #define D_PROJECT "Projekt"
+#define D_PSR_FREE_MEMORY "PS-RAM free Memory"
+#define D_PSR_MAX_MEMORY "PS-RAM Memory"
 #define D_RAIN "Regn"
 #define D_RANGE "Range"
 #define D_RECEIVED "Mottagen"
 #define D_RESTART "Omstart"
-#define D_RESTARTING "Startar om"
 #define D_RESTART_REASON "Omstartsorsak"
+#define D_RESTARTING "Startar om"
 #define D_RETAINED "bevarad"
 #define D_RULE "Regel"
 #define D_SAVE "Spara"
 #define D_SENSOR "Sensor"
+#define D_SOC "State of Charge"
+#define D_SOH "State of Health"
 #define D_SSID "SSId"
 #define D_START "Starta"
 #define D_STD_TIME "STD"
 #define D_STOP "Stoppa"
 #define D_SUBNET_MASK "Nätmask"
 #define D_SUBSCRIBE_TO "Prenumera på"
-#define D_UNSUBSCRIBE_FROM "Unsubscribe from"
 #define D_SUCCESSFUL "Lyckat"
 #define D_SUNRISE "Soluppgång"
 #define D_SUNSET "Solnedgång"
 #define D_TEMPERATURE "Temperatur"
+#define D_TIME_OF_DAY "Tid"
 #define D_TO "till"
 #define D_TOGGLE "Växla"
 #define D_TOPIC "Ämne"
@@ -195,6 +197,7 @@
 #define D_TWILIGHT_ASTRONOMICAL "Astronomical"
 #define D_TWILIGHT_CIVIL "Civil"
 #define D_TWILIGHT_NAUTICAL "Nautical"
+#define D_UNSUBSCRIBE_FROM "Unsubscribe from"
 #define D_UPLOAD "Ladda upp"
 #define D_UPTIME "Upptid"
 #define D_USED "used"
@@ -214,12 +217,10 @@
 #define D_VOC "VOC"
 #define D_VOLTAGE "Volttal"
 #define D_VOLUME "Volume"
-#define D_WEIGHT "Vikt"
 #define D_WARMLIGHT "Varm"
-#define D_WEB_SERVER "Webbserver"
-#define D_SOC "State of Charge"
-#define D_SOH "State of Health"
 #define D_WATER_DEPTH "Vattendjup"
+#define D_WEB_SERVER "Webbserver"
+#define D_WEIGHT "Vikt"
 
 // tasmota.ino
 #define D_WARNING_MINIMAL_VERSION "VARNING Denna version supporterar inte beständiga inställningar"
@@ -474,7 +475,6 @@
 #define D_TIMER_PARAMETERS "Timerparametrar"
 #define D_TIMER_ENABLE "Aktivera timer"
 #define D_TIMER_ARM "Aktivera"
-#define D_TIMER_TIME "Tid"
 #define D_TIMER_DAYS "Dagar"
 #define D_TIMER_REPEAT "Repetera"
 #define D_TIMER_OUTPUT "Utgång"
diff --git a/tasmota/language/tr_TR.h b/tasmota/language/tr_TR.h
index 9d15c99d6..bf8ef7e2b 100644
--- a/tasmota/language/tr_TR.h
+++ b/tasmota/language/tr_TR.h
@@ -60,8 +60,8 @@
 #define D_AT "at"
 #define D_AUTO "OTOMATIK"
 #define D_AUTO_UPDATE "Auto Update"
-#define D_BATTERY "Battery"
 #define D_BATT "Batt"                // Short for Battery
+#define D_BATTERY "Battery"
 #define D_BATTERY_CHARGE "Charge"   // Battery charge in %
 #define D_BLINK "Blink"
 #define D_BLINKOFF "BlinkOff"
@@ -76,17 +76,17 @@
 #define D_CO2 "Karbon dioksit"
 #define D_CODE "kod"                // Button code
 #define D_COLDLIGHT "Soğuk"
+#define D_COLOR "Color"
 #define D_COMMAND "Komut"
 #define D_CONNECTED "Bağlandı"
 #define D_CORS_DOMAIN "CORS Domain"
-#define D_COLOR "Color"
 #define D_COUNT "Sayı"
 #define D_COUNTER "Sayaç"
 #define D_CT_POWER "CT Power"
 #define D_CURRENT "Current"          // As in Voltage and Current
 #define D_CURRENT_NEUTRAL "Current Neutral"
-#define D_DATA "Data"
 #define D_DARKLIGHT "Karanlık"
+#define D_DATA "Data"
 #define D_DEBUG "Hata Ayıklama"
 #define D_DEWPOINT "Dew point"
 #define D_DISABLED "Etkin Değil"
@@ -113,15 +113,13 @@
 #define D_FRAGMENTATION "frag."      // Lower case abbreviated version of fragmentation used in "memory fragmentation"
 #define D_FRAME_RATE "Frame rate"
 #define D_FREE_MEMORY "Boş Hafıza"
-#define D_PSR_MAX_MEMORY "PS-RAM Memory"
-#define D_PSR_FREE_MEMORY "PS-RAM free Memory"
 #define D_FREQUENCY "Frekans"
 #define D_GAS "Gas"
 #define D_GATEWAY "Geçit"
 #define D_GROUP "Grup"
-#define D_HOST "Host"
 #define D_HALL_EFFECT "Hall Effect"
 #define D_HEATINDEX "Heat index"
+#define D_HOST "Host"
 #define D_HOSTNAME "Host Adresi"
 #define D_HUMIDITY "Nem"
 #define D_ILLUMINANCE "Aydınlık"
@@ -132,10 +130,11 @@
 #define D_INITIALIZED "Başlatıldı"
 #define D_IP_ADDRESS "IP Adresi"
 #define D_LIGHT "Işık"
-#define D_LWT "LWT"
 #define D_LQI "LQI"                  // Zigbee Link Quality Index
+#define D_LWT "LWT"
 #define D_MODULE "Modül"
 #define D_MOISTURE "Moisture"
+#define D_MQ "MQ"
 #define D_MQTT "MQTT"
 #define D_MULTI_PRESS "multi-press"
 #define D_NOISE "Noise"
@@ -148,10 +147,9 @@
 #define D_ON "On"
 #define D_ONLINE "Çevirimiçi"
 #define D_ORP "ORP"
+#define D_PARTITION "Partition"      // As in flash and firmware partition
 #define D_PASSWORD "Şifre"
 #define D_PH "pH"
-#define D_MQ "MQ"
-#define D_PARTITION "Partition"      // As in flash and firmware partition
 #define D_PORT "Port"
 #define D_POWER_FACTOR "Güç Faktörü"
 #define D_POWERUSAGE "Güç"
@@ -164,27 +162,31 @@
 #define D_PROGRAM_FLASH_SIZE "Yazılım Flash Boyutu"
 #define D_PROGRAM_SIZE "Yazılım Boyutu"
 #define D_PROJECT "Proje"
+#define D_PSR_FREE_MEMORY "PS-RAM free Memory"
+#define D_PSR_MAX_MEMORY "PS-RAM Memory"
 #define D_RAIN "Rain"
 #define D_RANGE "Range"
 #define D_RECEIVED "Alınan"
 #define D_RESTART "Yeniden Başlat"
-#define D_RESTARTING "Yeniden Başlatılıyor"
 #define D_RESTART_REASON "Yeniden Başlatma Sebebi"
+#define D_RESTARTING "Yeniden Başlatılıyor"
 #define D_RETAINED "tutulan"
 #define D_RULE "Kural"
 #define D_SAVE "Kaydet"
 #define D_SENSOR "Sensör"
+#define D_SOC "State of Charge"
+#define D_SOH "State of Health"
 #define D_SSID "SSId"
 #define D_START "Başlat"
 #define D_STD_TIME "STD"
 #define D_STOP "Durdur"
 #define D_SUBNET_MASK "Altağ Geçidi Maskesi"
 #define D_SUBSCRIBE_TO "Abone olunan"
-#define D_UNSUBSCRIBE_FROM "Unsubscribe from"
 #define D_SUCCESSFUL "Başarıyla Tamamlandı"
 #define D_SUNRISE "Gün doğumu"
 #define D_SUNSET "Gün batımı"
 #define D_TEMPERATURE "Sıcaklık"
+#define D_TIME_OF_DAY "Zaman"
 #define D_TO "den"
 #define D_TOGGLE "Geçiş Tuşu"
 #define D_TOPIC "Başlık"
@@ -195,6 +197,7 @@
 #define D_TWILIGHT_ASTRONOMICAL "Astronomical"
 #define D_TWILIGHT_CIVIL "Civil"
 #define D_TWILIGHT_NAUTICAL "Nautical"
+#define D_UNSUBSCRIBE_FROM "Unsubscribe from"
 #define D_UPLOAD "Yükleme"
 #define D_UPTIME "Açık Kalma Süresi"
 #define D_USED "used"
@@ -214,12 +217,10 @@
 #define D_VOC "VOC"
 #define D_VOLTAGE "Voltaj"
 #define D_VOLUME "Volume"
-#define D_WEIGHT "Weight"
 #define D_WARMLIGHT "Sıcak"
-#define D_WEB_SERVER "Web Sunucusu"
-#define D_SOC "State of Charge"
-#define D_SOH "State of Health"
 #define D_WATER_DEPTH "Su derinliği"
+#define D_WEB_SERVER "Web Sunucusu"
+#define D_WEIGHT "Weight"
 
 // tasmota.ino
 #define D_WARNING_MINIMAL_VERSION "UYARI Bu versiyon ayarların kalıcı olarak kaydedilmesine olanak sağlamıyor"
@@ -474,7 +475,6 @@
 #define D_TIMER_PARAMETERS "Zamanlayıcı Parametreleri"
 #define D_TIMER_ENABLE "Zamanlayıcı Aktif"
 #define D_TIMER_ARM "Arm"
-#define D_TIMER_TIME "Zaman"
 #define D_TIMER_DAYS "Gün"
 #define D_TIMER_REPEAT "Tekrar"
 #define D_TIMER_OUTPUT "Output"
diff --git a/tasmota/language/uk_UA.h b/tasmota/language/uk_UA.h
index 9485e2ef4..a8fd8bb03 100644
--- a/tasmota/language/uk_UA.h
+++ b/tasmota/language/uk_UA.h
@@ -60,8 +60,8 @@
 #define D_AT "at"
 #define D_AUTO "АВТО"
 #define D_AUTO_UPDATE "Auto Update"
-#define D_BATTERY "Battery"
 #define D_BATT "Batt"                // Short for Battery
+#define D_BATTERY "Battery"
 #define D_BATTERY_CHARGE "Charge"   // Battery charge in %
 #define D_BLINK "Блимати"
 #define D_BLINKOFF "Не блимати"
@@ -76,17 +76,17 @@
 #define D_CO2 "Вуглек. газ"
 #define D_CODE "код"                // Button code
 #define D_COLDLIGHT "Холодний"
+#define D_COLOR "Color"
 #define D_COMMAND "Команда"
 #define D_CONNECTED "Під'єднано"
 #define D_CORS_DOMAIN "Домен CORS"
-#define D_COLOR "Color"
 #define D_COUNT "разів"
 #define D_COUNTER "Лічильник"
 #define D_CT_POWER "CT Power"
 #define D_CURRENT "Струм"           // As in Voltage and Current
 #define D_CURRENT_NEUTRAL "Current Neutral"
-#define D_DATA "Дані"
 #define D_DARKLIGHT "Темний"
+#define D_DATA "Дані"
 #define D_DEBUG "Налагодження"
 #define D_DEWPOINT "Tочка роси"
 #define D_DISABLED "Вимкнено"
@@ -113,15 +113,13 @@
 #define D_FRAGMENTATION "frag."      // Lower case abbreviated version of fragmentation used in "memory fragmentation"
 #define D_FRAME_RATE "Frame rate"
 #define D_FREE_MEMORY "Вільна память"
-#define D_PSR_MAX_MEMORY "PS-RAM Memory"
-#define D_PSR_FREE_MEMORY "PS-RAM free Memory"
 #define D_FREQUENCY "Частота"
 #define D_GAS "Газ"
 #define D_GATEWAY "Шлюз"
 #define D_GROUP "Група"
-#define D_HOST "Хост"
 #define D_HALL_EFFECT "Hall Effect"
 #define D_HEATINDEX "Heat index"
+#define D_HOST "Хост"
 #define D_HOSTNAME "Назва хосту"
 #define D_HUMIDITY "Вологість"
 #define D_ILLUMINANCE "Освітленність"
@@ -132,10 +130,11 @@
 #define D_INITIALIZED "Ініціалізовано"
 #define D_IP_ADDRESS "IP адреса"
 #define D_LIGHT "Світло"
-#define D_LWT "LWT"
 #define D_LQI "LQI"                  // Zigbee Link Quality Index
+#define D_LWT "LWT"
 #define D_MODULE "Модуль"
 #define D_MOISTURE "Волога"
+#define D_MQ "MQ"
 #define D_MQTT "MQTT"
 #define D_MULTI_PRESS "Багаторазове натискання"
 #define D_NOISE "Шум"
@@ -148,10 +147,9 @@
 #define D_ON "Увімкнено"
 #define D_ONLINE "Активний"
 #define D_ORP "ORP"
+#define D_PARTITION "Partition"      // As in flash and firmware partition
 #define D_PASSWORD "Гасло"
 #define D_PH "pH"
-#define D_MQ "MQ"
-#define D_PARTITION "Partition"      // As in flash and firmware partition
 #define D_PORT "Порт"
 #define D_POWER_FACTOR "Коефіцієнт потужності"
 #define D_POWERUSAGE "Потужність"
@@ -164,27 +162,31 @@
 #define D_PROGRAM_FLASH_SIZE "Розмір Flash для програм"
 #define D_PROGRAM_SIZE "Розмір програми"
 #define D_PROJECT "Проект"
+#define D_PSR_FREE_MEMORY "PS-RAM free Memory"
+#define D_PSR_MAX_MEMORY "PS-RAM Memory"
 #define D_RAIN "Дощ"
 #define D_RANGE "Range"
 #define D_RECEIVED "Отримано"
 #define D_RESTART "Перезавантаження"
-#define D_RESTARTING "Перезавантаження"
 #define D_RESTART_REASON "Причина перезавантаження"
+#define D_RESTARTING "Перезавантаження"
 #define D_RETAINED "зберігати"
 #define D_RULE "Правило"
 #define D_SAVE "Зберегти"
 #define D_SENSOR "Давач"
+#define D_SOC "State of Charge"
+#define D_SOH "State of Health"
 #define D_SSID "SSID"
 #define D_START "Старт"
 #define D_STD_TIME "Стандартний час"
 #define D_STOP "Стоп"
 #define D_SUBNET_MASK "Маска підмережі"
 #define D_SUBSCRIBE_TO "Підписатись на"
-#define D_UNSUBSCRIBE_FROM "Відписатися від"
 #define D_SUCCESSFUL "Успішно"
 #define D_SUNRISE "Схід сонця"
 #define D_SUNSET "Захід сонця"
 #define D_TEMPERATURE "Температура"
+#define D_TIME_OF_DAY "Час"
 #define D_TO "до"
 #define D_TOGGLE "Перекл."
 #define D_TOPIC "Топік"
@@ -195,6 +197,7 @@
 #define D_TWILIGHT_ASTRONOMICAL "Astronomical"
 #define D_TWILIGHT_CIVIL "Civil"
 #define D_TWILIGHT_NAUTICAL "Nautical"
+#define D_UNSUBSCRIBE_FROM "Відписатися від"
 #define D_UPLOAD "Завантажити"
 #define D_UPTIME "Час роботи"
 #define D_USED "used"
@@ -214,12 +217,10 @@
 #define D_VOC "VOC"
 #define D_VOLTAGE "Напруга"
 #define D_VOLUME "Volume"
-#define D_WEIGHT "Вага"
 #define D_WARMLIGHT "Тепло"
-#define D_WEB_SERVER "Web сервер"
-#define D_SOC "State of Charge"
-#define D_SOH "State of Health"
 #define D_WATER_DEPTH "Глибина води"
+#define D_WEB_SERVER "Web сервер"
+#define D_WEIGHT "Вага"
 
 // tasmota.ino
 #define D_WARNING_MINIMAL_VERSION "ПОПЕРЕДЖЕННЯ! Ця версія не підтримує збереження налаштувань"
@@ -474,7 +475,6 @@
 #define D_TIMER_PARAMETERS "Налаштування таймерів"
 #define D_TIMER_ENABLE "Таймери увімкнені"
 #define D_TIMER_ARM "Увімкнений"
-#define D_TIMER_TIME "Час"
 #define D_TIMER_DAYS "Дні"
 #define D_TIMER_REPEAT "Повторення"
 #define D_TIMER_OUTPUT "Вихід"
diff --git a/tasmota/language/vi_VN.h b/tasmota/language/vi_VN.h
index f04fcebb1..6f85cad0f 100644
--- a/tasmota/language/vi_VN.h
+++ b/tasmota/language/vi_VN.h
@@ -60,8 +60,8 @@
 #define D_AT "at"
 #define D_AUTO "AUTO"
 #define D_AUTO_UPDATE "Auto Update"
-#define D_BATTERY "Battery"
 #define D_BATT "Batt"                // Short for Battery
+#define D_BATTERY "Battery"
 #define D_BATTERY_CHARGE "Charge"   // Battery charge in %
 #define D_BLINK "Blink"
 #define D_BLINKOFF "BlinkOff"
@@ -76,17 +76,17 @@
 #define D_CO2 "Khí CO2"
 #define D_CODE "code"                // Button code
 #define D_COLDLIGHT "Lạnh"
+#define D_COLOR "Color"
 #define D_COMMAND "Dòng Lệnh"
 #define D_CONNECTED "Đã kết nối"
 #define D_CORS_DOMAIN "CORS Domain"
-#define D_COLOR "Color"
 #define D_COUNT "Đếm"
 #define D_COUNTER "Bộ đếm"
 #define D_CT_POWER "CT Power"
 #define D_CURRENT "Dòng điện"          // As in Voltage and Current
 #define D_CURRENT_NEUTRAL "Current Neutral"
-#define D_DATA "Dữ liệu"
 #define D_DARKLIGHT "Tối"
+#define D_DATA "Dữ liệu"
 #define D_DEBUG "Tìm lỗi"
 #define D_DEWPOINT "Điểm sương"
 #define D_DISABLED "Vô hiệu hóa"
@@ -113,15 +113,13 @@
 #define D_FRAGMENTATION "frag."      // Lower case abbreviated version of fragmentation used in "memory fragmentation"
 #define D_FRAME_RATE "Frame rate"
 #define D_FREE_MEMORY "Bộ nhớ trống"
-#define D_PSR_MAX_MEMORY "Bộ nhớ PS-RAM"
-#define D_PSR_FREE_MEMORY "Bộ nhớ PS-RAM trống"
 #define D_FREQUENCY "Tần số"
 #define D_GAS "Khí"
 #define D_GATEWAY "Cổng kết nối"
 #define D_GROUP "Nhóm"
-#define D_HOST "Máy chủ"
 #define D_HALL_EFFECT "Hall Effect"
 #define D_HEATINDEX "Heat index"
+#define D_HOST "Máy chủ"
 #define D_HOSTNAME "Tên máy chủ"
 #define D_HUMIDITY "Độ ẩm"
 #define D_ILLUMINANCE "Độ sáng"
@@ -132,10 +130,11 @@
 #define D_INITIALIZED "Khởi tạo"
 #define D_IP_ADDRESS "Địa chỉ IP"
 #define D_LIGHT "Đèn"
-#define D_LWT "LWT"
 #define D_LQI "LQI"                  // Zigbee Link Quality Index
+#define D_LWT "LWT"
 #define D_MODULE "Mô đun"
 #define D_MOISTURE "Hơi ẩm"
+#define D_MQ "MQ"
 #define D_MQTT "MQTT"
 #define D_MULTI_PRESS "bấm nhiều lần"
 #define D_NOISE "Nhiễu"
@@ -148,10 +147,9 @@
 #define D_ON "Bật"
 #define D_ONLINE "Trực tuyến"
 #define D_ORP "ORP"
+#define D_PARTITION "Partition"      // As in flash and firmware partition
 #define D_PASSWORD "Mật khẩu"
 #define D_PH "pH"
-#define D_MQ "MQ"
-#define D_PARTITION "Partition"      // As in flash and firmware partition
 #define D_PORT "Cổng"
 #define D_POWER_FACTOR "Hệ số công suất"
 #define D_POWERUSAGE "Công suất"
@@ -164,27 +162,31 @@
 #define D_PROGRAM_FLASH_SIZE "Kích thước chương trình Flash"
 #define D_PROGRAM_SIZE "Kích thước chương trình"
 #define D_PROJECT "Dự án"
+#define D_PSR_FREE_MEMORY "Bộ nhớ PS-RAM trống"
+#define D_PSR_MAX_MEMORY "Bộ nhớ PS-RAM"
 #define D_RAIN "Mưa"
 #define D_RANGE "Khoảng"
 #define D_RECEIVED "Đã nhận"
 #define D_RESTART "Khởi động lại"
-#define D_RESTARTING "Đang khởi động"
 #define D_RESTART_REASON "Lý do khởi động lại"
+#define D_RESTARTING "Đang khởi động"
 #define D_RETAINED "lưu giữ"
 #define D_RULE "Quy luật"
 #define D_SAVE "Lưu"
 #define D_SENSOR "Cảm biến"
+#define D_SOC "State of Charge"
+#define D_SOH "State of Health"
 #define D_SSID "Tên Wifi"
 #define D_START "Bắt đầu"
 #define D_STD_TIME "STD"
 #define D_STOP "Dừng lại"
 #define D_SUBNET_MASK "Subnet Mask"
 #define D_SUBSCRIBE_TO "Đăng ký với"
-#define D_UNSUBSCRIBE_FROM "Hủy đăng ký từ "
 #define D_SUCCESSFUL "Thành công"
 #define D_SUNRISE "Mặt trời mọc"
 #define D_SUNSET "Mặt trời lặn"
 #define D_TEMPERATURE "Nhiệt độ"
+#define D_TIME_OF_DAY "Thời gian"
 #define D_TO "tới"
 #define D_TOGGLE "Bật Tắt"
 #define D_TOPIC "Chủ đề"
@@ -195,6 +197,7 @@
 #define D_TWILIGHT_ASTRONOMICAL "Astronomical"
 #define D_TWILIGHT_CIVIL "Civil"
 #define D_TWILIGHT_NAUTICAL "Nautical"
+#define D_UNSUBSCRIBE_FROM "Hủy đăng ký từ "
 #define D_UPLOAD "Tải lên"
 #define D_UPTIME "Thời gian chạy"
 #define D_USED "used"
@@ -214,12 +217,10 @@
 #define D_VOC "VOC"
 #define D_VOLTAGE "Điện áp"
 #define D_VOLUME "Volume"
-#define D_WEIGHT "Cân nặng"
 #define D_WARMLIGHT "Ấm"
-#define D_WEB_SERVER "Máy chủ Web"
-#define D_SOC "State of Charge"
-#define D_SOH "State of Health"
 #define D_WATER_DEPTH "Độ sâu nước"
+#define D_WEB_SERVER "Máy chủ Web"
+#define D_WEIGHT "Cân nặng"
 
 // tasmota.ino
 #define D_WARNING_MINIMAL_VERSION "Cảnh báo phiên bản này không hỗ trợ các cài đặt vĩnh viễn"
@@ -474,7 +475,6 @@
 #define D_TIMER_PARAMETERS "Các thông số hẹn giờ"
 #define D_TIMER_ENABLE "Kích hoạt hẹn giờ"
 #define D_TIMER_ARM "Kích hoạt"
-#define D_TIMER_TIME "Thời gian"
 #define D_TIMER_DAYS "Ngày"
 #define D_TIMER_REPEAT "Lặp lại"
 #define D_TIMER_OUTPUT "Ngõ ra"
diff --git a/tasmota/language/zh_CN.h b/tasmota/language/zh_CN.h
index 87e173370..3d49e6950 100644
--- a/tasmota/language/zh_CN.h
+++ b/tasmota/language/zh_CN.h
@@ -60,8 +60,8 @@
 #define D_AT "at"
 #define D_AUTO "自动"
 #define D_AUTO_UPDATE "Auto Update"
-#define D_BATTERY "Battery"
 #define D_BATT "Batt"                // Short for Battery
+#define D_BATTERY "Battery"
 #define D_BATTERY_CHARGE "Charge"   // Battery charge in %
 #define D_BLINK "闪烁"
 #define D_BLINKOFF "闪烁关"
@@ -76,17 +76,17 @@
 #define D_CO2 "二氧化碳"
 #define D_CODE "代码"                // Button code
 #define D_COLDLIGHT "冷"
+#define D_COLOR "Color"
 #define D_COMMAND "命令:"
 #define D_CONNECTED "已连接"
 #define D_CORS_DOMAIN "CORS Domain"
-#define D_COLOR "Color"
 #define D_COUNT "数量:"
 #define D_COUNTER "计数器"
 #define D_CT_POWER "CT Power"
 #define D_CURRENT "电流"          // As in Voltage and Current
 #define D_CURRENT_NEUTRAL "Current Neutral"
-#define D_DATA "数据:"
 #define D_DARKLIGHT "暗"
+#define D_DATA "数据:"
 #define D_DEBUG "调试"
 #define D_DEWPOINT "Dew point"
 #define D_DISABLED "禁用"
@@ -113,15 +113,13 @@
 #define D_FRAGMENTATION "frag."      // Lower case abbreviated version of fragmentation used in "memory fragmentation"
 #define D_FRAME_RATE "Frame rate"
 #define D_FREE_MEMORY "空闲内存"
-#define D_PSR_MAX_MEMORY "PS-RAM Memory"
-#define D_PSR_FREE_MEMORY "PS-RAM free Memory"
 #define D_FREQUENCY "频率"
 #define D_GAS "气体"
 #define D_GATEWAY "网关"
 #define D_GROUP "组:"
-#define D_HOST "主机"
 #define D_HALL_EFFECT "Hall Effect"
 #define D_HEATINDEX "Heat index"
+#define D_HOST "主机"
 #define D_HOSTNAME "主机名"
 #define D_HUMIDITY "湿度"
 #define D_ILLUMINANCE "照度"
@@ -132,10 +130,11 @@
 #define D_INITIALIZED "初始化完成"
 #define D_IP_ADDRESS "IP地址"
 #define D_LIGHT "灯"
-#define D_LWT "LWT"
 #define D_LQI "LQI"                  // Zigbee Link Quality Index
+#define D_LWT "LWT"
 #define D_MODULE "模块"
 #define D_MOISTURE "Moisture"
+#define D_MQ "MQ"
 #define D_MQTT "MQTT"
 #define D_MULTI_PRESS "多次按键"
 #define D_NOISE "嘈杂"
@@ -148,10 +147,9 @@
 #define D_ON "开"
 #define D_ONLINE "在线"
 #define D_ORP "ORP"
+#define D_PARTITION "分区"      // As in flash and firmware partition
 #define D_PASSWORD "密码"
 #define D_PH "pH"
-#define D_MQ "MQ"
-#define D_PARTITION "分区"      // As in flash and firmware partition
 #define D_PORT "端口"
 #define D_POWER_FACTOR "功率因数"
 #define D_POWERUSAGE "功率"
@@ -164,27 +162,31 @@
 #define D_PROGRAM_FLASH_SIZE "固件 Flash 大小"
 #define D_PROGRAM_SIZE "固件大小"
 #define D_PROJECT "项目:"
+#define D_PSR_FREE_MEMORY "PS-RAM free Memory"
+#define D_PSR_MAX_MEMORY "PS-RAM Memory"
 #define D_RAIN "降水量"
 #define D_RANGE "Range"
 #define D_RECEIVED "已接收"
 #define D_RESTART "重启"
-#define D_RESTARTING "正在重启"
 #define D_RESTART_REASON "重启原因"
+#define D_RESTARTING "正在重启"
 #define D_RETAINED "已保留"
 #define D_RULE "规则"
 #define D_SAVE "保存"
 #define D_SENSOR "传感器"
+#define D_SOC "充电状态"
+#define D_SOH "充电健康"
 #define D_SSID "名称"
 #define D_START "开始"
 #define D_STD_TIME "STD"
 #define D_STOP "停止"
 #define D_SUBNET_MASK "子网掩码"
 #define D_SUBSCRIBE_TO "订阅"
-#define D_UNSUBSCRIBE_FROM "退订"
 #define D_SUCCESSFUL "成功"
 #define D_SUNRISE "日出"
 #define D_SUNSET "日落"
 #define D_TEMPERATURE "温度"
+#define D_TIME_OF_DAY "时间"
 #define D_TO "to"
 #define D_TOGGLE "切换"
 #define D_TOPIC "主题"
@@ -195,6 +197,7 @@
 #define D_TWILIGHT_ASTRONOMICAL "Astronomical"
 #define D_TWILIGHT_CIVIL "Civil"
 #define D_TWILIGHT_NAUTICAL "Nautical"
+#define D_UNSUBSCRIBE_FROM "退订"
 #define D_UPLOAD "上传"
 #define D_UPTIME "运行时间"
 #define D_USED "已使用"
@@ -214,12 +217,10 @@
 #define D_VOC "VOC"
 #define D_VOLTAGE "电压"
 #define D_VOLUME "Volume"
-#define D_WEIGHT "重量"
 #define D_WARMLIGHT "暖"
-#define D_WEB_SERVER "Web服务器"
-#define D_SOC "充电状态"
-#define D_SOH "充电健康"
 #define D_WATER_DEPTH "水深"
+#define D_WEB_SERVER "Web服务器"
+#define D_WEIGHT "重量"
 
 // tasmota.ino
 #define D_WARNING_MINIMAL_VERSION "警告：精简固件不支持持久保存设置"
@@ -474,7 +475,6 @@
 #define D_TIMER_PARAMETERS "定时器参数"
 #define D_TIMER_ENABLE "启用定时器"
 #define D_TIMER_ARM "启用"
-#define D_TIMER_TIME "时间"
 #define D_TIMER_DAYS "天"
 #define D_TIMER_REPEAT "重复"
 #define D_TIMER_OUTPUT "输出"
diff --git a/tasmota/language/zh_TW.h b/tasmota/language/zh_TW.h
index ab03f1efd..395699313 100644
--- a/tasmota/language/zh_TW.h
+++ b/tasmota/language/zh_TW.h
@@ -60,8 +60,8 @@
 #define D_AT "at"
 #define D_AUTO "自動"
 #define D_AUTO_UPDATE "Auto Update"
-#define D_BATTERY "Battery"
 #define D_BATT "電池"                // Short for Battery
+#define D_BATTERY "Battery"
 #define D_BATTERY_CHARGE "Charge"  // Battery charge in % 
 #define D_BLINK "閃爍"
 #define D_BLINKOFF "閃爍關"
@@ -76,17 +76,17 @@
 #define D_CO2 "二氧化碳"
 #define D_CODE "代碼"                // Button code
 #define D_COLDLIGHT "冷光"
+#define D_COLOR "Color"
 #define D_COMMAND "命令:"
 #define D_CONNECTED "已連線"
 #define D_CORS_DOMAIN "跨來源資源共享的網域(CORS Domain)"
-#define D_COLOR "Color"
 #define D_COUNT "數量:"
 #define D_COUNTER "Counter"
 #define D_CT_POWER "CT Power"
 #define D_CURRENT "電流"          // As in Voltage and Current
 #define D_CURRENT_NEUTRAL "Current Neutral"
-#define D_DATA "數據:"
 #define D_DARKLIGHT "暗光"
+#define D_DATA "數據:"
 #define D_DEBUG "偵錯"
 #define D_DEWPOINT "Dew point"
 #define D_DISABLED "已停用"
@@ -113,15 +113,13 @@
 #define D_FRAGMENTATION "frag."      // Lower case abbreviated version of fragmentation used in "memory fragmentation"
 #define D_FRAME_RATE "Frame rate"
 #define D_FREE_MEMORY "可用的記憶體"
-#define D_PSR_MAX_MEMORY "偽靜態隨機存取記憶體(PS-RAM)容量"
-#define D_PSR_FREE_MEMORY "偽靜態隨機存取記憶體(PS-RAM)可用空間"
 #define D_FREQUENCY "頻率"
 #define D_GAS "氣體"
 #define D_GATEWAY "閘道器"
 #define D_GROUP "群組:"
-#define D_HOST "主機"
 #define D_HALL_EFFECT "Hall Effect"
 #define D_HEATINDEX "Heat index"
+#define D_HOST "主機"
 #define D_HOSTNAME "主機名稱"
 #define D_HUMIDITY "濕度"
 #define D_ILLUMINANCE "照度"
@@ -132,10 +130,11 @@
 #define D_INITIALIZED "已初始化"
 #define D_IP_ADDRESS "IP位址"
 #define D_LIGHT "燈光"
-#define D_LWT "LWT"
 #define D_LQI "LQI"                  // Zigbee Link Quality Index
+#define D_LWT "LWT"
 #define D_MODULE "模組"
 #define D_MOISTURE "濕度"
+#define D_MQ "MQ"
 #define D_MQTT "MQTT"
 #define D_MULTI_PRESS "多重點擊"
 #define D_NOISE "雜訊"
@@ -148,10 +147,9 @@
 #define D_ON "開啟"
 #define D_ONLINE "線上"
 #define D_ORP "ORP"
+#define D_PARTITION "Partition"      // As in flash and firmware partition
 #define D_PASSWORD "密碼"
 #define D_PH "pH"
-#define D_MQ "MQ"
-#define D_PARTITION "Partition"      // As in flash and firmware partition
 #define D_PORT "通訊埠"
 #define D_POWER_FACTOR "功率因數"
 #define D_POWERUSAGE "用電量"
@@ -164,27 +162,31 @@
 #define D_PROGRAM_FLASH_SIZE "程式記憶體大小"
 #define D_PROGRAM_SIZE "程式大小"
 #define D_PROJECT "項目:"
+#define D_PSR_FREE_MEMORY "偽靜態隨機存取記憶體(PS-RAM)可用空間"
+#define D_PSR_MAX_MEMORY "偽靜態隨機存取記憶體(PS-RAM)容量"
 #define D_RAIN "雨"
 #define D_RANGE "範圍"
 #define D_RECEIVED "已接收"
 #define D_RESTART "重新啟動"
-#define D_RESTARTING "正在重新啟動"
 #define D_RESTART_REASON "重新啟動的原因"
+#define D_RESTARTING "正在重新啟動"
 #define D_RETAINED "已保留"
 #define D_RULE "規則"
 #define D_SAVE "儲存"
 #define D_SENSOR "感應器"
+#define D_SOC "State of Charge"
+#define D_SOH "State of Health"
 #define D_SSID "SSID"
 #define D_START "啟動"
 #define D_STD_TIME "標準時間"
 #define D_STOP "停止"
 #define D_SUBNET_MASK "子網域遮罩"
 #define D_SUBSCRIBE_TO "訂閱"
-#define D_UNSUBSCRIBE_FROM "退出訂閱自"
 #define D_SUCCESSFUL "已成功"
 #define D_SUNRISE "日出"
 #define D_SUNSET "日落"
 #define D_TEMPERATURE "溫度"
+#define D_TIME_OF_DAY "時間"
 #define D_TO "到"
 #define D_TOGGLE "切換"
 #define D_TOPIC "主題"
@@ -195,6 +197,7 @@
 #define D_TWILIGHT_ASTRONOMICAL "Astronomical"
 #define D_TWILIGHT_CIVIL "Civil"
 #define D_TWILIGHT_NAUTICAL "Nautical"
+#define D_UNSUBSCRIBE_FROM "退出訂閱自"
 #define D_UPLOAD "上傳"
 #define D_UPTIME "啟動時間"
 #define D_USED "used"
@@ -214,12 +217,10 @@
 #define D_VOC "VOC"
 #define D_VOLTAGE "電壓"
 #define D_VOLUME "Volume"
-#define D_WEIGHT "重量"
 #define D_WARMLIGHT "暖光"
-#define D_WEB_SERVER "網頁伺服器"
-#define D_SOC "State of Charge"
-#define D_SOH "State of Health"
 #define D_WATER_DEPTH "水深"
+#define D_WEB_SERVER "網頁伺服器"
+#define D_WEIGHT "重量"
 
 // tasmota.ino
 #define D_WARNING_MINIMAL_VERSION "警告，這個版本並不支援將設定永久的儲存!"
@@ -474,7 +475,6 @@
 #define D_TIMER_PARAMETERS "計時器參數"
 #define D_TIMER_ENABLE "啟用"
 #define D_TIMER_ARM "Arm"
-#define D_TIMER_TIME "時間"
 #define D_TIMER_DAYS "日數"
 #define D_TIMER_REPEAT "重複"
 #define D_TIMER_OUTPUT "輸出"
diff --git a/tasmota/tasmota_xdrv_driver/xdrv_01_9_webserver.ino b/tasmota/tasmota_xdrv_driver/xdrv_01_9_webserver.ino
index afe188c7f..bb769ee57 100644
--- a/tasmota/tasmota_xdrv_driver/xdrv_01_9_webserver.ino
+++ b/tasmota/tasmota_xdrv_driver/xdrv_01_9_webserver.ino
@@ -1998,7 +1998,7 @@ bool HandleRootStatusRefresh(void) {
   WSContentSend_P(PSTR("{t}"));        // <table style='width:100%'>
   WSContentSeparator(3);               // Reset seperator to ignore previous outputs 
   if (Settings->web_time_end) {
-    WSContentSend_P(PSTR("{s}" D_TIMER_TIME "{m}%s{e}"), GetDateAndTime(DT_LOCAL).substring(Settings->web_time_start, Settings->web_time_end).c_str());
+    WSContentSend_P(PSTR("{s}" D_TIME_OF_DAY "{m}%s{e}"), GetDateAndTime(DT_LOCAL).substring(Settings->web_time_start, Settings->web_time_end).c_str());
     WSContentSeparator(0);             // Print separator
   }
   XsnsXdrvCall(FUNC_WEB_SENSOR);
diff --git a/tasmota/tasmota_xdrv_driver/xdrv_09_timers.ino b/tasmota/tasmota_xdrv_driver/xdrv_09_timers.ino
index a1cdfec6e..734b93890 100644
--- a/tasmota/tasmota_xdrv_driver/xdrv_09_timers.ino
+++ b/tasmota/tasmota_xdrv_driver/xdrv_09_timers.ino
@@ -821,7 +821,7 @@ const char HTTP_FORM_TIMER2[] PROGMEM =
 #ifdef USE_SUNRISE
 const char HTTP_FORM_TIMER3[] PROGMEM =
   "<fieldset style='width:%dpx;margin:auto;text-align:left;border:0;'>"
-  "<label><input id='b0' name='rd' type='radio' value='0' onclick='gt();'><b>" D_TIMER_TIME "</b></label><br>"
+  "<label><input id='b0' name='rd' type='radio' value='0' onclick='gt();'><b>" D_TIME_OF_DAY "</b></label><br>"
   "<label><input id='b1' name='rd' type='radio' value='1' onclick='gt();'><b>" D_SUNRISE "</b>%s (%s)</label><br>"
   "<label><input id='b2' name='rd' type='radio' value='2' onclick='gt();'><b>" D_SUNSET "</b>%s (%s)</label><br>"
   "</fieldset>"
@@ -830,7 +830,7 @@ const char HTTP_FORM_TIMER3[] PROGMEM =
   "&nbsp;";
 #else
 const char HTTP_FORM_TIMER3[] PROGMEM =
-  "<b>" D_TIMER_TIME "</b>&nbsp;";
+  "<b>" D_TIME_OF_DAY "</b>&nbsp;";
 #endif  // USE_SUNRISE
 
 #ifdef USE_UNISHOX_COMPRESSION