diff --git a/interface/src/i18n/cz/index.ts b/interface/src/i18n/cz/index.ts
index 1c2888626..07f534e64 100644
--- a/interface/src/i18n/cz/index.ts
+++ b/interface/src/i18n/cz/index.ts
@@ -31,8 +31,8 @@ const cz: Translation = {
   ID_OF: '{0} ID',
   DEVICE: 'Zařízení',
   PRODUCT: 'Produkt',
-  VERSION: 'Verze',
   BRAND: 'Značka',
+  VERSION: 'Verze',
   ENTITY_NAME: 'Název entity',
   VALUE: '{{value|Value}}',
   DEVICES: 'Zařízení',
@@ -102,8 +102,8 @@ const cz: Translation = {
   PHY_TYPE: 'Typ Eth PHY',
   DISABLED: 'zakázáno',
   TX_MODE: 'EMS Tx režim',
-  HARDWARE: 'Hardware',
   EMS_BUS: '{{Bus|EMS Bus}}',
+  HARDWARE: 'Hardware',
   GENERAL_OPTIONS: 'Obecné možnosti',
   LANGUAGE_ENTITIES: 'Jazyk (pro entity zařízení)',
   HIDE_LED: 'Skrýt LED',
@@ -367,7 +367,7 @@ const cz: Translation = {
   COMMANDS: 'Příkazy',
   COMMANDS_UPDATED: 'Příkazy byly aktualizovány',
   COMMANDS_HELP_1: 'Definujte vlastní příkazy pro magistrali EMS',
-  EXECUTE_COMMAND_SENT: 'Příkaz byl odeslán.',
+  EXECUTE_COMMAND_SENT: 'Příkaz odeslán',
 };
 
 export default cz;
diff --git a/interface/src/i18n/de/index.ts b/interface/src/i18n/de/index.ts
index 364d3f161..5910a3e2e 100644
--- a/interface/src/i18n/de/index.ts
+++ b/interface/src/i18n/de/index.ts
@@ -31,8 +31,8 @@ const de: Translation = {
   ID_OF: '{0}-ID',
   DEVICE: 'Geräte',
   PRODUCT: 'Produkt',
-  VERSION: 'Version',
   BRAND: 'Marke',
+  VERSION: 'Version',
   ENTITY_NAME: 'Entitätsname',
   VALUE: '{{wert|Wert}}',
   DEVICES: 'Geräte',
@@ -102,8 +102,8 @@ const de: Translation = {
   PHY_TYPE: 'Eth PHY Typ',
   DISABLED: 'deaktiviert',
   TX_MODE: 'EMS Tx-Modus',
-  HARDWARE: 'Hardware',
   EMS_BUS: '{{Bus|EMS Bus}}',
+  HARDWARE: 'Hardware',
   GENERAL_OPTIONS: 'Allgemeine Optionen',
   LANGUAGE_ENTITIES: 'Sprache (für Geräteentitäten)',
   HIDE_LED: 'LED ausblenden',
@@ -367,7 +367,7 @@ const de: Translation = {
   COMMANDS: 'Befehle',
   COMMANDS_UPDATED: 'Befehle wurden aktualisiert',
   COMMANDS_HELP_1: 'Definieren Sie eigene Befehle für die EMS-Magistral',
-  EXECUTE_COMMAND_SENT: 'Befehl wurde ausgeführt.',
+  EXECUTE_COMMAND_SENT: 'Befehl gesendet',
 };
 
 export default de;
diff --git a/interface/src/i18n/en/index.ts b/interface/src/i18n/en/index.ts
index ed6128704..b8926781f 100644
--- a/interface/src/i18n/en/index.ts
+++ b/interface/src/i18n/en/index.ts
@@ -31,8 +31,8 @@ const en: Translation = {
   ID_OF: '{0} ID',
   DEVICE: 'Device',
   PRODUCT: 'Product',
-  VERSION: 'Version',
   BRAND: 'Brand',
+  VERSION: 'Version',
   ENTITY_NAME: 'Entity Name',
   VALUE: '{{value|Value}}',
   DEVICES: 'Devices',
@@ -102,8 +102,8 @@ const en: Translation = {
   PHY_TYPE: 'Eth PHY Type',
   DISABLED: 'disabled',
   TX_MODE: 'EMS Tx Mode',
-  HARDWARE: 'Hardware',
   EMS_BUS: '{{Bus|EMS Bus}}',
+  HARDWARE: 'Hardware',
   GENERAL_OPTIONS: 'General Options',
   LANGUAGE_ENTITIES: 'Language (for device entities)',
   HIDE_LED: 'Hide LED',
@@ -285,9 +285,6 @@ const en: Translation = {
   BLOCK_NAVIGATE_2: 'If you navigate to a different page, your unsaved changes will be lost. Are you sure you want to leave this page?',
   STAY: 'Stay',
   LEAVE: 'Leave',
-  COMMANDS: 'Commands',
-  COMMANDS_HELP_1: 'Define reusable named commands below. These can be executed from the console, API/MQTT, or referenced by the Scheduler',
-  EXECUTE_COMMAND_SENT: 'Command executed successfully',
   SCHEDULER: 'Scheduler',
   SCHEDULER_HELP_1: 'Automate commands by adding scheduled events below',
   SCHEDULER_HELP_2: 'at start-up',
@@ -339,11 +336,11 @@ const en: Translation = {
   RESTARTING_POST: 'Preparing',
   AUTO_SCROLL: 'Auto Scroll',
   DASHBOARD: 'Dashboard',
-  DASHBOARD_1: 'All EMS entities that are active and marked as Favorite, plus all Custom Entities, Schedules and external Sensors data are displayed below.',
   DEVELOPER_MODE: 'Developer Mode',
   BYTES: 'Bytes',
   BITMASK: 'Bit Mask',
   DUPLICATE: 'Duplicate',
+  DASHBOARD_1: 'All EMS entities that are active and marked as Favorite, plus all Custom Entities, Schedules and external Sensors data are displayed below.',
   NO_DATA_1: 'No favorite EMS entities found yet. Use the',
   NO_DATA_2: 'module to mark them.',
   NO_DATA_3: 'To see all available entities go to',
@@ -363,7 +360,11 @@ const en: Translation = {
   UPGRADE_IMPORTANT_MESSAGES_2: 'You are upgrading to a new major version. Make sure you have read the ChangeLog for any breaking changes.',
   WARNING_SYSTEM_BACKUP: 'This will create a backup of your full system configuration and settings. All passwords will be readable in the backup file. Be careful with sharing! Do you want to continue?',
   TEST_EMAIL_SUCCESSFUL: 'Test email sent successfully',
-  SYSTEM_NAME: 'System Name'
+  SYSTEM_NAME: 'System Name',
+  COMMANDS: 'Commands',
+  COMMANDS_UPDATED: 'Commands updated',
+  COMMANDS_HELP_1: 'Define reusable named commands below. These can be executed from the console, API/MQTT, or referenced by the Scheduler',
+  EXECUTE_COMMAND_SENT: 'Command sent',
 };
 
 export default en;
diff --git a/interface/src/i18n/fr/index.ts b/interface/src/i18n/fr/index.ts
index 10a2415f9..84afbd11b 100644
--- a/interface/src/i18n/fr/index.ts
+++ b/interface/src/i18n/fr/index.ts
@@ -31,8 +31,8 @@ const fr: Translation = {
   ID_OF: 'ID {0}',
   DEVICE: 'Appareil',
   PRODUCT: 'Produit',
-  VERSION: 'Version',
   BRAND: 'Marque',
+  VERSION: 'Version',
   ENTITY_NAME: "Nom de l'entité",
   VALUE: 'Valeur',
   DEVICES: 'Appareils',
@@ -102,8 +102,8 @@ const fr: Translation = {
   PHY_TYPE: 'Eth PHY Type',
   DISABLED: 'désactivé',
   TX_MODE: 'EMS Tx Mode',
-  HARDWARE: 'Hardware',
   EMS_BUS: '{{Bus|EMS Bus}}',
+  HARDWARE: 'Hardware',
   GENERAL_OPTIONS: 'Options générales',
   LANGUAGE_ENTITIES: 'Langue (pour les entités du matériel)',
   HIDE_LED: 'Cacher la LED',
@@ -113,9 +113,9 @@ const fr: Translation = {
   BYPASS_TOKEN: "Contourner l'autorisation du jeton d'accès sur les appels API",
   READONLY: 'Activer le mode lecture uniquement (bloque toutes les commandes EMS sortantes en écriture Tx)',
   UNDERCLOCK_CPU: 'Underclock du CPU',
-  HEATINGOFF: 'Démarrer le chauffage avec le chauffage forcé éteint',
   REMOTE_TIMEOUT: 'Remote timeout',
   REMOTE_TIMEOUT_EN: 'Disable remote on missing room temperature',
+  HEATINGOFF: 'Démarrer le chauffage avec le chauffage forcé éteint',
   MIN_DURATION: 'Wait time',
   ENABLE_SHOWER_TIMER: 'Activer la minuterie de la douche',
   ENABLE_SHOWER_ALERT: 'Activer les alertes de durée de douche',
@@ -367,7 +367,7 @@ const fr: Translation = {
   COMMANDS: 'Commandes',
   COMMANDS_UPDATED: 'Commandes mises à jour',
   COMMANDS_HELP_1: 'Définir des commandes personnalisées pour la magistral EMS',
-  EXECUTE_COMMAND_SENT: 'Commande exécutée avec succès.',
+  EXECUTE_COMMAND_SENT: 'Commande envoyée',
 };
 
 export default fr;
diff --git a/interface/src/i18n/it/index.ts b/interface/src/i18n/it/index.ts
index 0aab1e8ef..6021b1e89 100644
--- a/interface/src/i18n/it/index.ts
+++ b/interface/src/i18n/it/index.ts
@@ -31,8 +31,8 @@ const it: Translation = {
   ID_OF: '{0} ID',
   DEVICE: 'Dispositivo',
   PRODUCT: 'Prodotto',
-  VERSION: 'Versione',
   BRAND: 'Marca',
+  VERSION: 'Versione',
   ENTITY_NAME: 'Nome Entità',
   VALUE: '{{valore|Valore}}',
   DEVICES: 'Dispositivi',
@@ -102,8 +102,8 @@ const it: Translation = {
   PHY_TYPE: 'Eth PHY Type',
   DISABLED: 'disattivato',
   TX_MODE: 'EMS Modo Tx ',
-  HARDWARE: 'Hardware',
   EMS_BUS: '{{Bus|EMS Bus}}',
+  HARDWARE: 'Hardware',
   GENERAL_OPTIONS: 'Opzioni Generali',
   LANGUAGE_ENTITIES: 'Lingua (per entità dispositivi)',
   HIDE_LED: 'Nascondi LED',
@@ -367,7 +367,7 @@ const it: Translation = {
   COMMANDS: 'Comandi',
   COMMANDS_UPDATED: 'Comandi aggiornati',
   COMMANDS_HELP_1: 'Definisci comandi personalizzati per la magistrali EMS',
-  EXECUTE_COMMAND_SENT: 'Comando eseguito con successo.',
+  EXECUTE_COMMAND_SENT: 'Comando inviato',
 };
 
 export default it;
diff --git a/interface/src/i18n/nl/index.ts b/interface/src/i18n/nl/index.ts
index 8ac54f1c4..075cead2b 100644
--- a/interface/src/i18n/nl/index.ts
+++ b/interface/src/i18n/nl/index.ts
@@ -31,8 +31,8 @@ const nl: Translation = {
   ID_OF: '{0} ID',
   DEVICE: 'Apparaat',
   PRODUCT: 'Product',
-  VERSION: 'Versie',
   BRAND: 'Merk',
+  VERSION: 'Versie',
   ENTITY_NAME: 'Entiteit',
   VALUE: '{{waarde|Waarde}}',
   DEVICES: 'Apparaten',
@@ -100,10 +100,10 @@ const nl: Translation = {
   BUTTON: 'Toets',
   TEMPERATURE: 'Temperatuur',
   PHY_TYPE: 'Eth PHY Type',
-  TX_MODE: 'EMS Tx Mode',
-  HARDWARE: 'Hardware',
-  EMS_BUS: '{{Bus|EMS Bus}}',
   DISABLED: 'Uitgeschakeld',
+  TX_MODE: 'EMS Tx Mode',
+  EMS_BUS: '{{Bus|EMS Bus}}',
+  HARDWARE: 'Hardware',
   GENERAL_OPTIONS: 'Algemene Opties',
   LANGUAGE_ENTITIES: 'Taal (voor apparaat entiteiten)',
   HIDE_LED: 'Verberg LED',
@@ -367,7 +367,7 @@ const nl: Translation = {
   COMMANDS: 'Commando\'s',
   COMMANDS_UPDATED: 'Commando\'s bijgewerkt',
   COMMANDS_HELP_1: 'Definieer hergebruikbare benoemde commando\'s hieronder. Deze kunnen worden uitgevoerd vanuit de console, API/MQTT, of worden aangeroepen door de Scheduler',
-  EXECUTE_COMMAND_SENT: 'Commando uitgevoerd.',
+  EXECUTE_COMMAND_SENT: 'Commando verzonden',
 };
 
 export default nl;
diff --git a/interface/src/i18n/no/index.ts b/interface/src/i18n/no/index.ts
index 6bb7fb990..f820d7f04 100644
--- a/interface/src/i18n/no/index.ts
+++ b/interface/src/i18n/no/index.ts
@@ -31,8 +31,8 @@ const no: Translation = {
   ID_OF: '{0}-ID',
   DEVICE: 'Enhets',
   PRODUCT: 'Produkt',
-  VERSION: 'Versjon',
   BRAND: 'Fabrikat',
+  VERSION: 'Versjon',
   ENTITY_NAME: 'Objektsnavn',
   VALUE: '{{verdi|Verdi}}',
   DEVICES: 'Enheter',
@@ -102,8 +102,8 @@ const no: Translation = {
   PHY_TYPE: 'Eth PHY Type',
   DISABLED: 'avslått',
   TX_MODE: 'EMS Tx Mode',
-  HARDWARE: 'Hardware',
   EMS_BUS: '{{Bus|EMS Bus}}',
+  HARDWARE: 'Hardware',
   GENERAL_OPTIONS: 'Generelle Innstillinger',
   LANGUAGE_ENTITIES: 'Språk (for objekter)',
   HIDE_LED: 'Skjul LED',
@@ -367,7 +367,7 @@ const no: Translation = {
   COMMANDS: 'Kommandoer',
   COMMANDS_UPDATED: 'Kommandoer oppdatert',
   COMMANDS_HELP_1: 'Definer egne kommandoer for EMS-Magistral',
-  EXECUTE_COMMAND_SENT: 'Kommando utført.',
+  EXECUTE_COMMAND_SENT: 'Kommando sendt',
 };
 
 export default no;
diff --git a/interface/src/i18n/pl/index.ts b/interface/src/i18n/pl/index.ts
index 3d462196b..313d92bf6 100644
--- a/interface/src/i18n/pl/index.ts
+++ b/interface/src/i18n/pl/index.ts
@@ -367,7 +367,7 @@ const pl: BaseTranslation = {
   COMMANDS: 'Komendy',
   COMMANDS_UPDATED: 'Komendy zostały zaktualizowane',
   COMMANDS_HELP_1: 'Zdefiniuj niestandardowe komendy dla magistrali EMS',
-  EXECUTE_COMMAND_SENT: 'Komenda została wysłana.'
+  EXECUTE_COMMAND_SENT: 'Komenda wysłana',
 };
 
 export default pl;
diff --git a/interface/src/i18n/sk/index.ts b/interface/src/i18n/sk/index.ts
index dffa4de2f..36f3e87f9 100644
--- a/interface/src/i18n/sk/index.ts
+++ b/interface/src/i18n/sk/index.ts
@@ -31,8 +31,8 @@ const sk: Translation = {
   ID_OF: '{0} ID',
   DEVICE: 'Zariadenie',
   PRODUCT: 'Produkt',
-  VERSION: 'Verzia',
   BRAND: 'Značka',
+  VERSION: 'Verzia',
   ENTITY_NAME: 'Názov entity',
   VALUE: '{{hodnota|Hodnota}}',
   DEVICES: 'Zariadenia',
@@ -102,8 +102,8 @@ const sk: Translation = {
   PHY_TYPE: 'Eth PHY Typ',
   DISABLED: 'zakázané',
   TX_MODE: 'EMS Tx režim',
-  HARDWARE: 'Hardware',
   EMS_BUS: '{{Bus|EMS Bus}}',
+  HARDWARE: 'Hardware',
   GENERAL_OPTIONS: 'Všeobecné možnosti',
   LANGUAGE_ENTITIES: 'Jazyk (pre entity zariadenia)',
   HIDE_LED: 'Skryť LED',
@@ -367,7 +367,7 @@ const sk: Translation = {
   COMMANDS: 'Príkazy',
   COMMANDS_UPDATED: 'Príkazy aktualizované',
   COMMANDS_HELP_1: 'Definujte vlastné príkazy pre magistrali EMS',
-  EXECUTE_COMMAND_SENT: 'Príkaz bol vykonaný.',
+  EXECUTE_COMMAND_SENT: 'Príkaz odoslaný',
 };
 
 export default sk;
diff --git a/interface/src/i18n/sv/index.ts b/interface/src/i18n/sv/index.ts
index c33e4fbaa..7d29faa1d 100644
--- a/interface/src/i18n/sv/index.ts
+++ b/interface/src/i18n/sv/index.ts
@@ -31,8 +31,8 @@ const sv: Translation = {
   ID_OF: '{0}-ID',
   DEVICE: 'Enhet',
   PRODUCT: 'Produkt',
-  VERSION: 'Version',
   BRAND: 'Fabrikat',
+  VERSION: 'Version',
   ENTITY_NAME: 'Entitetsnamn',
   VALUE: '{{värde|Värde}}',
   DEVICES: 'Enheter',
@@ -102,8 +102,8 @@ const sv: Translation = {
   PHY_TYPE: 'Eth PHY-typ',
   DISABLED: 'inaktiverad',
   TX_MODE: 'EMS Tx-läge',
-  HARDWARE: 'Hårdvara',
   EMS_BUS: '{{Buss|EMS-Buss}}',
+  HARDWARE: 'Hårdvara',
   GENERAL_OPTIONS: 'Allmänna inställningar',
   LANGUAGE_ENTITIES: 'Språk (för entiteter)',
   HIDE_LED: 'Inaktivera LED',
@@ -367,7 +367,7 @@ const sv: Translation = {
   COMMANDS: 'Kommandon',
   COMMANDS_UPDATED: 'Kommandon uppdaterade',
   COMMANDS_HELP_1: 'Definiera egna kommandon för EMS-Magistral',
-  EXECUTE_COMMAND_SENT: 'Kommando utfört.',
+  EXECUTE_COMMAND_SENT: 'Kommando skickat',
 };
 
 export default sv;
diff --git a/interface/src/i18n/tr/index.ts b/interface/src/i18n/tr/index.ts
index 69e681bd7..9f7c02bf2 100644
--- a/interface/src/i18n/tr/index.ts
+++ b/interface/src/i18n/tr/index.ts
@@ -31,8 +31,8 @@ const tr: Translation = {
   ID_OF: 'Kimlik {0}',
   DEVICE: 'Cihaz',
   PRODUCT: 'Ürün',
-  VERSION: 'Sürüm',
   BRAND: 'Marka',
+  VERSION: 'Sürüm',
   ENTITY_NAME: 'Valık Adı',
   VALUE: '{{değer|Değer}}',
   DEVICES: 'Cihazlar',
@@ -102,8 +102,8 @@ const tr: Translation = {
   PHY_TYPE: 'Eth PHY Tipi',
   DISABLED: 'devre dışı',
   TX_MODE: 'EMS Tx Modu',
-  HARDWARE: 'Donanım',
   EMS_BUS: '{{Hat|EMS Hatti}}',
+  HARDWARE: 'Donanım',
   GENERAL_OPTIONS: 'Genel Seçenekler',
   LANGUAGE_ENTITIES: 'Dil (cihaz varlıkları için)',
   HIDE_LED: 'LEDi kapa',
@@ -367,7 +367,7 @@ const tr: Translation = {
   COMMANDS: 'Komutlar',
   COMMANDS_UPDATED: 'Komutlar güncellendi',
   COMMANDS_HELP_1: 'Özel komutları EMS hattına tanımlayın',
-  EXECUTE_COMMAND_SENT: 'Komut başarıyla çalıştırıldı.',
+  EXECUTE_COMMAND_SENT: 'Komut gönderildi',
 };
 
 export default tr;