diff --git a/src/lang/en_US.h b/src/lang/en_US.h index 9b01a3a1..f62d3d1c 100644 --- a/src/lang/en_US.h +++ b/src/lang/en_US.h @@ -128,4 +128,7 @@ #define D_OOBE_MSG "Tap the screen to setup WiFi or connect to this Access Point:" #define D_OOBE_SCAN_TO_CONNECT "Scan to connect" +#define D_WIFI_CONNECTING_TO "Connecting to %s" +#define D_WIFI_CONNECTED_TO "Connected to %s, requesting IP..." + #endif \ No newline at end of file diff --git a/src/lang/hu_HU.h b/src/lang/hu_HU.h index 5a5141f6..cbb38377 100644 --- a/src/lang/hu_HU.h +++ b/src/lang/hu_HU.h @@ -1,131 +1,134 @@ -#ifndef HASP_LANG_HU_HU_H -#define HASP_LANG_HU_HU_H - -#define D_USERNAME "Felhasználónév:" -#define D_PASSWORD "Jelszó:" -#define D_SSID "SSID:" +#ifndef HASP_LANG_HU_HU_H +#define HASP_LANG_HU_HU_H -#define D_ERROR_OUT_OF_MEMORY "Elfogyott a memória" -#define D_ERROR_UNKNOWN "Ismeretlen hiba" +#define D_USERNAME "Felhasználónév:" +#define D_PASSWORD "Jelszó:" +#define D_SSID "SSID:" -#define D_CONFIG_NOT_CHANGED "A beállítások nem változtak" -#define D_CONFIG_CHANGED "A beállítások megváltoztak" -#define D_CONFIG_LOADED "Beállítások betöltve" +#define D_ERROR_OUT_OF_MEMORY "Elfogyott a memória" +#define D_ERROR_UNKNOWN "Ismeretlen hiba" -#define D_FILE_LOADING "%s betöltése" -#define D_FILE_LOADED "%s betöltve" -#define D_FILE_LOAD_FAILED "%s betöltése nem sikerült" +#define D_CONFIG_NOT_CHANGED "A beállítások nem változtak" +#define D_CONFIG_CHANGED "A beállítások megváltoztak" +#define D_CONFIG_LOADED "Beállítások betöltve" -#define D_FILE_SAVING "%s mentése" -#define D_FILE_SAVED "%s mentve" -#define D_FILE_SAVE_FAILED "%s mentése meghiúsult" +#define D_FILE_LOADING "%s betöltése" +#define D_FILE_LOADED "%s betöltve" +#define D_FILE_LOAD_FAILED "%s betöltése nem sikerült" -#define D_SERVICE_STARTING "Indítás..." -#define D_SERVICE_STARTED "Elindítva" -#define D_SERVICE_START_FAILED "Az indítás meghiúsult" -#define D_SERVICE_STOPPED "Megállva" -#define D_SERVICE_DISABLED "Tiltva" -#define D_SERVICE_CONNECTED "Csatlakoztatva" -#define D_SERVICE_DISCONNECTED "Szétkapcsolva" +#define D_FILE_SAVING "%s mentése" +#define D_FILE_SAVED "%s mentve" +#define D_FILE_SAVE_FAILED "%s mentése meghiúsult" -#define D_NETWORK_IP_ADDRESS_RECEIVED "Beállított IP-cím: %s" -#define D_NETWORK_ONLINE "online" -#define D_NETWORK_OFFLINE "offline" -#define D_NETWORK_CONNECTION_FAILED "A kapcsolódás meghiúsult" +#define D_SERVICE_STARTING "Indítás..." +#define D_SERVICE_STARTED "Elindítva" +#define D_SERVICE_START_FAILED "Az indítás meghiúsult" +#define D_SERVICE_STOPPED "Megállva" +#define D_SERVICE_DISABLED "Tiltva" +#define D_SERVICE_CONNECTED "Csatlakoztatva" +#define D_SERVICE_DISCONNECTED "Szétkapcsolva" -#define D_MQTT_DEFAULT_NAME "plate_%s" -#define D_MQTT_CONNECTING "Csatlakozás..." -#define D_MQTT_CONNECTED "Csatlakozva a %s szerverhez mint %s" -#define D_MQTT_NOT_CONNECTED "Nincs kapcsolat ???" -#define D_MQTT_DISCONNECTING "Szétkapcsolás..." -#define D_MQTT_DISCONNECTED "Szétkapcsolva" -#define D_MQTT_RECONNECTING "Lekapcsolva a szerverről, újracsatlakozás..." -#define D_MQTT_NOT_CONFIGURED "Nincs konfigurálva MQTT szerver" -#define D_MQTT_STARTED "Elindítva: %d bájt" -#define D_MQTT_FAILED "Nem sikerült:" -#define D_MQTT_INVALID_TOPIC "Az üzenet érvénytelen topik-ot tartalmaz" -#define D_MQTT_SUBSCRIBED "Feliratkozva: %s" -#define D_MQTT_NOT_SUBSCRIBED "Nem sikerült feliratkozni: %s" -#define D_MQTT_HA_AUTO_DISCOVERY "Regisztrálás HA automatikus felfedezésre" +#define D_NETWORK_IP_ADDRESS_RECEIVED "Beállított IP-cím: %s" +#define D_NETWORK_ONLINE "online" +#define D_NETWORK_OFFLINE "offline" +#define D_NETWORK_CONNECTION_FAILED "A kapcsolódás meghiúsult" -#define D_TELNET_CLOSING_CONNECTION "Munkamenet befejezése %s-el" -#define D_TELNET_CLIENT_LOGIN_FROM "Kliens bejelentkezés innen: %s" -#define D_TELNET_CLIENT_CONNECT_FROM "Kliens csatlakozva innen: %s" -#define D_TELNET_CLIENT_NOT_CONNECTED "Kliens NEM csatlakozik" -#define D_TELNET_AUTHENTICATION_FAILED "A hitelesítés sikertelen!" -#define D_TELNET_INCORRECT_LOGIN_ATTEMPT "Helytelen bejelentkezési kísérlet %s-ről" -#define D_TELNET_STARTED "Telnet konzol elindítva" -#define D_TELNET_FAILED "Telnet konzol elindítása meghiúsult" -#define D_TELNET_CLIENT_CONNECTED "Kliens csatlakozva" -#define D_TELNET_CLIENT_NOT_CONNECTED "Kliens NEM csatlakozik" -#define D_TELNET_CLIENT_REJECTED "Kliens elutasítva" +#define D_MQTT_DEFAULT_NAME "plate_%s" +#define D_MQTT_CONNECTING "Csatlakozás..." +#define D_MQTT_CONNECTED "Csatlakozva a %s szerverhez mint %s" +#define D_MQTT_NOT_CONNECTED "Nincs kapcsolat ???" +#define D_MQTT_DISCONNECTING "Szétkapcsolás..." +#define D_MQTT_DISCONNECTED "Szétkapcsolva" +#define D_MQTT_RECONNECTING "Lekapcsolva a szerverről, újracsatlakozás..." +#define D_MQTT_NOT_CONFIGURED "Nincs konfigurálva MQTT szerver" +#define D_MQTT_STARTED "Elindítva: %d bájt" +#define D_MQTT_FAILED "Nem sikerült:" +#define D_MQTT_INVALID_TOPIC "Az üzenet érvénytelen topik-ot tartalmaz" +#define D_MQTT_SUBSCRIBED "Feliratkozva: %s" +#define D_MQTT_NOT_SUBSCRIBED "Nem sikerült feliratkozni: %s" +#define D_MQTT_HA_AUTO_DISCOVERY "Regisztrálás HA automatikus felfedezésre" -#define D_HASP_INVALID_PAGE "Érvénytelen oldal: %u" -#define D_HASP_INVALID_LAYER "Nem törölhető a rendszerréteg" -#define D_HASP_CHANGE_PAGE "Oldalváltás: %u" -#define D_HASP_CLEAR_PAGE "Oldal törlése: %u" +#define D_TELNET_CLOSING_CONNECTION "Munkamenet befejezése %s-el" +#define D_TELNET_CLIENT_LOGIN_FROM "Kliens bejelentkezés innen: %s" +#define D_TELNET_CLIENT_CONNECT_FROM "Kliens csatlakozva innen: %s" +#define D_TELNET_CLIENT_NOT_CONNECTED "Kliens NEM csatlakozik" +#define D_TELNET_AUTHENTICATION_FAILED "A hitelesítés sikertelen!" +#define D_TELNET_INCORRECT_LOGIN_ATTEMPT "Helytelen bejelentkezési kísérlet %s-ről" +#define D_TELNET_STARTED "Telnet konzol elindítva" +#define D_TELNET_FAILED "Telnet konzol elindítása meghiúsult" +#define D_TELNET_CLIENT_CONNECTED "Kliens csatlakozva" +#define D_TELNET_CLIENT_NOT_CONNECTED "Kliens NEM csatlakozik" +#define D_TELNET_CLIENT_REJECTED "Kliens elutasítva" -#define D_OBJECT_DELETED "Objektum törölve" -#define D_OBJECT_UNKNOWN "Ismeretlen objektum" -#define D_OBJECT_MISMATCH "Az objektumok NEM passzolnak!" -#define D_OBJECT_LOST "Elveszett objektum!" -#define D_OBJECT_CREATE_FAILED "%u objektum sikertelen" -#define D_OBJECT_PAGE_UNKNOWN "%u oldalazonosító nincs meghatározva" -#define D_OBJECT_EVENT_UNKNOWN "Ismeretlen esemény %d" +#define D_HASP_INVALID_PAGE "Érvénytelen oldal: %u" +#define D_HASP_INVALID_LAYER "Nem törölhető a rendszerréteg" +#define D_HASP_CHANGE_PAGE "Oldalváltás: %u" +#define D_HASP_CLEAR_PAGE "Oldal törlése: %u" -#define D_ATTRIBUTE_UNKNOWN "Ismeretlen tulajdonság: %s" -#define D_ATTRIBUTE_READ_ONLY "%s csak olvasható" -#define D_ATTRIBUTE_PAGE_METHOD_INVALID "Nem lehet meghívni %s-t egy oldalon" +#define D_OBJECT_DELETED "Objektum törölve" +#define D_OBJECT_UNKNOWN "Ismeretlen objektum" +#define D_OBJECT_MISMATCH "Az objektumok NEM passzolnak!" +#define D_OBJECT_LOST "Elveszett objektum!" +#define D_OBJECT_CREATE_FAILED "%u objektum sikertelen" +#define D_OBJECT_PAGE_UNKNOWN "%u oldalazonosító nincs meghatározva" +#define D_OBJECT_EVENT_UNKNOWN "Ismeretlen esemény %d" -#define D_OOBE_SSID_VALIDATED "%s SSID érvényes" -#define D_OOBE_AUTO_CALIBRATE "Automatikus kalibrálás engedélyezve" -#define D_OOBE_CALIBRATED "Korábban kalibrálva" +#define D_ATTRIBUTE_UNKNOWN "Ismeretlen tulajdonság: %s" +#define D_ATTRIBUTE_READ_ONLY "%s csak olvasható" +#define D_ATTRIBUTE_PAGE_METHOD_INVALID "Nem lehet meghívni %s-t egy oldalon" -#define D_DISPATCH_COMMAND_NOT_FOUND "%s parancs nem található" -#define D_DISPATCH_INVALID_PAGE "Érvénytelen oldal: %s" -#define D_DISPATCH_REBOOT "Az MCU most újraindul!" +#define D_OOBE_SSID_VALIDATED "%s SSID érvényes" +#define D_OOBE_AUTO_CALIBRATE "Automatikus kalibrálás engedélyezve" +#define D_OOBE_CALIBRATED "Korábban kalibrálva" -#define D_JSON_FAILED "JSON elemzése nem sikerült:" -#define D_JSONL_FAILED "JSONL elemzése meghiúsult a %d vonalnál" -#define D_JSONL_SUCCEEDED "JSONL teljes körűen elemezve" +#define D_DISPATCH_COMMAND_NOT_FOUND "%s parancs nem található" +#define D_DISPATCH_INVALID_PAGE "Érvénytelen oldal: %s" +#define D_DISPATCH_REBOOT "Az MCU most újraindul!" -#define D_OTA_CHECK_UPDATE "A frissítések ellenőrzése az URL-en: %s" -#define D_OTA_CHECK_COMPLETE "A frissítések ellenőrzése befejeződött" -#define D_OTA_CHECK_FAILED "A frissítések ellenőrzése meghiúsult: %s" -#define D_OTA_UPDATE_FIRMWARE "Firmware frissítése OTA-val" -#define D_OTA_UPDATE_COMPLETE "Az OTA frissítés elkészült" -#define D_OTA_UPDATE_APPLY "Firmware alkalmazása és újraindítás" -#define D_OTA_UPDATE_FAILED "Az OTA frissítés meghiúsult" +#define D_JSON_FAILED "JSON elemzése nem sikerült:" +#define D_JSONL_FAILED "JSONL elemzése meghiúsult a %d vonalnál" +#define D_JSONL_SUCCEEDED "JSONL teljes körűen elemezve" -#define D_HTTP_HASP_DESIGN "Képernyő dizájn" -#define D_HTTP_INFORMATION "Információk" -#define D_HTTP_HTTP_SETTINGS "HTTP beállítások" -#define D_HTTP_WIFI_SETTINGS "WiFi beállítások" -#define D_HTTP_MQTT_SETTINGS "MQTT beállítások" -#define D_HTTP_GPIO_SETTINGS "GPIO beállítások" -#define D_HTTP_MDNS_SETTINGS "mDNS beállítások" -#define D_HTTP_TELNET_SETTINGS "Telnet beállítások" -#define D_HTTP_DEBUG_SETTINGS "Hibakeresési beállítások" -#define D_HTTP_GUI_SETTINGS "Képernyő beállítások" -#define D_HTTP_SAVE_SETTINGS "Beállítások mentése" -#define D_HTTP_UPLOAD_FILE "Fájl feltöltése" -#define D_HTTP_ERASE_DEVICE "Minden beállítás visszaállítása" -#define D_HTTP_ADD_GPIO "Új pin hozzáadása" -#define D_HTTP_BACK "Vissza" -#define D_HTTP_REFRESH "Frissítés" -#define D_HTTP_PREV_PAGE "Előző oldal" -#define D_HTTP_NEXT_PAGE "Következő oldal" -#define D_HTTP_CALIBRATE "Kalibrálás" -#define D_HTTP_SCREENSHOT "Képernyőkép" -#define D_HTTP_FILE_BROWSER "Fájl böngésző" -#define D_HTTP_FIRMWARE_UPGRADE "Firmware frissítés" -#define D_HTTP_UPDATE_FIRMWARE "Firmware frissítése" -#define D_HTTP_FACTORY_RESET "Gyári beállítások visszaállítása" -#define D_HTTP_MAIN_MENU "Főmenü" -#define D_HTTP_REBOOT "Újraindítás" -#define D_HTTP_CONFIGURATION "Beállítások" +#define D_OTA_CHECK_UPDATE "A frissítések ellenőrzése az URL-en: %s" +#define D_OTA_CHECK_COMPLETE "A frissítések ellenőrzése befejeződött" +#define D_OTA_CHECK_FAILED "A frissítések ellenőrzése meghiúsult: %s" +#define D_OTA_UPDATE_FIRMWARE "Firmware frissítése OTA-val" +#define D_OTA_UPDATE_COMPLETE "Az OTA frissítés elkészült" +#define D_OTA_UPDATE_APPLY "Firmware alkalmazása és újraindítás" +#define D_OTA_UPDATE_FAILED "Az OTA frissítés meghiúsult" -#define D_OOBE_MSG "Koppintson a képernyőre a WiFi beállításához, vagy csatlakozzon az alábbi Access Point-hoz:" -#define D_OOBE_SCAN_TO_CONNECT "Szkennelje le a csatlakozáshoz:" - -#endif +#define D_HTTP_HASP_DESIGN "Képernyő dizájn" +#define D_HTTP_INFORMATION "Információk" +#define D_HTTP_HTTP_SETTINGS "HTTP beállítások" +#define D_HTTP_WIFI_SETTINGS "WiFi beállítások" +#define D_HTTP_MQTT_SETTINGS "MQTT beállítások" +#define D_HTTP_GPIO_SETTINGS "GPIO beállítások" +#define D_HTTP_MDNS_SETTINGS "mDNS beállítások" +#define D_HTTP_TELNET_SETTINGS "Telnet beállítások" +#define D_HTTP_DEBUG_SETTINGS "Hibakeresési beállítások" +#define D_HTTP_GUI_SETTINGS "Képernyő beállítások" +#define D_HTTP_SAVE_SETTINGS "Beállítások mentése" +#define D_HTTP_UPLOAD_FILE "Fájl feltöltése" +#define D_HTTP_ERASE_DEVICE "Minden beállítás visszaállítása" +#define D_HTTP_ADD_GPIO "Új pin hozzáadása" +#define D_HTTP_BACK "Vissza" +#define D_HTTP_REFRESH "Frissítés" +#define D_HTTP_PREV_PAGE "Előző oldal" +#define D_HTTP_NEXT_PAGE "Következő oldal" +#define D_HTTP_CALIBRATE "Kalibrálás" +#define D_HTTP_SCREENSHOT "Képernyőkép" +#define D_HTTP_FILE_BROWSER "Fájl böngésző" +#define D_HTTP_FIRMWARE_UPGRADE "Firmware frissítés" +#define D_HTTP_UPDATE_FIRMWARE "Firmware frissítése" +#define D_HTTP_FACTORY_RESET "Gyári beállítások visszaállítása" +#define D_HTTP_MAIN_MENU "Főmenü" +#define D_HTTP_REBOOT "Újraindítás" +#define D_HTTP_CONFIGURATION "Beállítások" + +#define D_OOBE_MSG "Koppintson a képernyőre a WiFi beállításához, vagy csatlakozzon az alábbi Access Point-hoz:" +#define D_OOBE_SCAN_TO_CONNECT "Szkennelje le a csatlakozáshoz:" + +#define D_WIFI_CONNECTING_TO "$$$Connecting to %s" +#define D_WIFI_CONNECTED_TO "$$$Connected to %s, requesting IP..." + +#endif diff --git a/src/lang/nl_NL.h b/src/lang/nl_NL.h index 514b2029..4dc02118 100644 --- a/src/lang/nl_NL.h +++ b/src/lang/nl_NL.h @@ -127,4 +127,7 @@ #define D_OOBE_MSG "Raak het scherm aan om WiFi in te stellen of meld je aan op AP:" #define D_OOBE_SCAN_TO_CONNECT "Scan code" +#define D_WIFI_CONNECTING_TO "Verbinden met %s" +#define D_WIFI_CONNECTED_TO "Verbonden met %s, IP aanvragen..." + #endif \ No newline at end of file diff --git a/src/lang/ro_RO.h b/src/lang/ro_RO.h index cf3f200b..fee60c73 100644 --- a/src/lang/ro_RO.h +++ b/src/lang/ro_RO.h @@ -1,131 +1,134 @@ -#ifndef HASP_LANG_RO_RO_H -#define HASP_LANG_RO_RO_H - -#define D_USERNAME "Nume de utilizator:" -#define D_PASSWORD "Parola:" -#define D_SSID "SSID:" +#ifndef HASP_LANG_RO_RO_H +#define HASP_LANG_RO_RO_H -#define D_ERROR_OUT_OF_MEMORY "Memorie epuizată" -#define D_ERROR_UNKNOWN "Eroare necunoscută" +#define D_USERNAME "Nume de utilizator:" +#define D_PASSWORD "Parola:" +#define D_SSID "SSID:" -#define D_CONFIG_NOT_CHANGED "Setările nu s-au schimbat" -#define D_CONFIG_CHANGED "Setările s-au schimbat" -#define D_CONFIG_LOADED "Setările s-au încărcat" +#define D_ERROR_OUT_OF_MEMORY "Memorie epuizată" +#define D_ERROR_UNKNOWN "Eroare necunoscută" -#define D_FILE_LOADING "Se încarcă %s" -#define D_FILE_LOADED "S-a încărcat %s" -#define D_FILE_LOAD_FAILED "Încărcarea %s a eșuat" +#define D_CONFIG_NOT_CHANGED "Setările nu s-au schimbat" +#define D_CONFIG_CHANGED "Setările s-au schimbat" +#define D_CONFIG_LOADED "Setările s-au încărcat" -#define D_FILE_SAVING "Se salvează %s" -#define D_FILE_SAVED "S-a salvat %s" -#define D_FILE_SAVE_FAILED "Salvarea %s a eșuat" +#define D_FILE_LOADING "Se încarcă %s" +#define D_FILE_LOADED "S-a încărcat %s" +#define D_FILE_LOAD_FAILED "Încărcarea %s a eșuat" -#define D_SERVICE_STARTING "Pornire..." -#define D_SERVICE_STARTED "Pornit" -#define D_SERVICE_START_FAILED "Pornirea a eșuat" -#define D_SERVICE_STOPPED "S-a oprit" -#define D_SERVICE_DISABLED "Dezactivat" -#define D_SERVICE_CONNECTED "Conectat" -#define D_SERVICE_DISCONNECTED "Deconectat" +#define D_FILE_SAVING "Se salvează %s" +#define D_FILE_SAVED "S-a salvat %s" +#define D_FILE_SAVE_FAILED "Salvarea %s a eșuat" -#define D_NETWORK_IP_ADDRESS_RECEIVED "A primit adresa IP %s" -#define D_NETWORK_ONLINE "online" -#define D_NETWORK_OFFLINE "offline" -#define D_NETWORK_CONNECTION_FAILED "Conexiune eșuată" +#define D_SERVICE_STARTING "Pornire..." +#define D_SERVICE_STARTED "Pornit" +#define D_SERVICE_START_FAILED "Pornirea a eșuat" +#define D_SERVICE_STOPPED "S-a oprit" +#define D_SERVICE_DISABLED "Dezactivat" +#define D_SERVICE_CONNECTED "Conectat" +#define D_SERVICE_DISCONNECTED "Deconectat" -#define D_MQTT_DEFAULT_NAME "plate_%s" -#define D_MQTT_CONNECTING "Conectare..." -#define D_MQTT_CONNECTED "Conectat la serverul %s ca %s" -#define D_MQTT_NOT_CONNECTED "Nu e conectat ???" -#define D_MQTT_DISCONNECTING "Deconectare..." -#define D_MQTT_DISCONNECTED "Deconectat" -#define D_MQTT_RECONNECTING "Deconectat de la server, reconectare..." -#define D_MQTT_NOT_CONFIGURED "Nu este configurat serverul MQTT" -#define D_MQTT_STARTED "Început: %d octeți" -#define D_MQTT_FAILED "A eșuat:" -#define D_MQTT_INVALID_TOPIC "Mesajul are subiect nevalid" -#define D_MQTT_SUBSCRIBED "Abonat la %s" -#define D_MQTT_NOT_SUBSCRIBED "Abonarea la %s a eșuat" -#define D_MQTT_HA_AUTO_DISCOVERY "Înregistrare la auto-descoperire în HA" +#define D_NETWORK_IP_ADDRESS_RECEIVED "A primit adresa IP %s" +#define D_NETWORK_ONLINE "online" +#define D_NETWORK_OFFLINE "offline" +#define D_NETWORK_CONNECTION_FAILED "Conexiune eșuată" -#define D_TELNET_CLOSING_CONNECTION "Terminarea sesiunii de la %s" -#define D_TELNET_CLIENT_LOGIN_FROM "Conectare client de la %s" -#define D_TELNET_CLIENT_CONNECT_FROM "Client conectat de la %s" -#define D_TELNET_CLIENT_NOT_CONNECTED "Clientul NU este conectat" -#define D_TELNET_AUTHENTICATION_FAILED "Autorizatia a esuat!" -#define D_TELNET_INCORRECT_LOGIN_ATTEMPT "Încercare incorectă de autentificare de la %s" -#define D_TELNET_STARTED "Consola Telnet pornită" -#define D_TELNET_FAILED "Nu s-a putut porni consola Telnet" -#define D_TELNET_CLIENT_CONNECTED "Client conectat" -#define D_TELNET_CLIENT_NOT_CONNECTED "Client NU este conectat" -#define D_TELNET_CLIENT_REJECTED "Client respins" +#define D_MQTT_DEFAULT_NAME "plate_%s" +#define D_MQTT_CONNECTING "Conectare..." +#define D_MQTT_CONNECTED "Conectat la serverul %s ca %s" +#define D_MQTT_NOT_CONNECTED "Nu e conectat ???" +#define D_MQTT_DISCONNECTING "Deconectare..." +#define D_MQTT_DISCONNECTED "Deconectat" +#define D_MQTT_RECONNECTING "Deconectat de la server, reconectare..." +#define D_MQTT_NOT_CONFIGURED "Nu este configurat serverul MQTT" +#define D_MQTT_STARTED "Început: %d octeți" +#define D_MQTT_FAILED "A eșuat:" +#define D_MQTT_INVALID_TOPIC "Mesajul are subiect nevalid" +#define D_MQTT_SUBSCRIBED "Abonat la %s" +#define D_MQTT_NOT_SUBSCRIBED "Abonarea la %s a eșuat" +#define D_MQTT_HA_AUTO_DISCOVERY "Înregistrare la auto-descoperire în HA" -#define D_HASP_INVALID_PAGE "Pagina invalidă: %u" -#define D_HASP_INVALID_LAYER "Nu se poate șterge stratul de sistem" -#define D_HASP_CHANGE_PAGE "Schimbarea paginii: %u" -#define D_HASP_CLEAR_PAGE "Ștergerea paginii: %u" +#define D_TELNET_CLOSING_CONNECTION "Terminarea sesiunii de la %s" +#define D_TELNET_CLIENT_LOGIN_FROM "Conectare client de la %s" +#define D_TELNET_CLIENT_CONNECT_FROM "Client conectat de la %s" +#define D_TELNET_CLIENT_NOT_CONNECTED "Clientul NU este conectat" +#define D_TELNET_AUTHENTICATION_FAILED "Autorizatia a esuat!" +#define D_TELNET_INCORRECT_LOGIN_ATTEMPT "Încercare incorectă de autentificare de la %s" +#define D_TELNET_STARTED "Consola Telnet pornită" +#define D_TELNET_FAILED "Nu s-a putut porni consola Telnet" +#define D_TELNET_CLIENT_CONNECTED "Client conectat" +#define D_TELNET_CLIENT_NOT_CONNECTED "Client NU este conectat" +#define D_TELNET_CLIENT_REJECTED "Client respins" -#define D_OBJECT_DELETED "Obiect șters" -#define D_OBJECT_UNKNOWN "Obiect necunoscut" -#define D_OBJECT_MISMATCH "Obiectele NU se potrivesc!" -#define D_OBJECT_LOST "Obiect pierdut!" -#define D_OBJECT_CREATE_FAILED "Obiectul %u a eșuat" -#define D_OBJECT_PAGE_UNKNOWN "ID-ul paginii %u nu este definit" -#define D_OBJECT_EVENT_UNKNOWN "Eveniment necunoscut: %d" +#define D_HASP_INVALID_PAGE "Pagina invalidă: %u" +#define D_HASP_INVALID_LAYER "Nu se poate șterge stratul de sistem" +#define D_HASP_CHANGE_PAGE "Schimbarea paginii: %u" +#define D_HASP_CLEAR_PAGE "Ștergerea paginii: %u" -#define D_ATTRIBUTE_UNKNOWN "Proprietate necunoscută: %s" -#define D_ATTRIBUTE_READ_ONLY "%s este numai în citire" -#define D_ATTRIBUTE_PAGE_METHOD_INVALID "Nu se poate apela %s pe o pagină" +#define D_OBJECT_DELETED "Obiect șters" +#define D_OBJECT_UNKNOWN "Obiect necunoscut" +#define D_OBJECT_MISMATCH "Obiectele NU se potrivesc!" +#define D_OBJECT_LOST "Obiect pierdut!" +#define D_OBJECT_CREATE_FAILED "Obiectul %u a eșuat" +#define D_OBJECT_PAGE_UNKNOWN "ID-ul paginii %u nu este definit" +#define D_OBJECT_EVENT_UNKNOWN "Eveniment necunoscut: %d" -#define D_OOBE_SSID_VALIDATED "SSID %s validat" -#define D_OOBE_AUTO_CALIBRATE "Calibrarea automată este activă" -#define D_OOBE_CALIBRATED "Deja calibrat" +#define D_ATTRIBUTE_UNKNOWN "Proprietate necunoscută: %s" +#define D_ATTRIBUTE_READ_ONLY "%s este numai în citire" +#define D_ATTRIBUTE_PAGE_METHOD_INVALID "Nu se poate apela %s pe o pagină" -#define D_DISPATCH_COMMAND_NOT_FOUND "Comanda %s nu a fost găsită" -#define D_DISPATCH_INVALID_PAGE "Pagina invalidă %s" -#define D_DISPATCH_REBOOT "MCU-ul repornește acum!" +#define D_OOBE_SSID_VALIDATED "SSID %s validat" +#define D_OOBE_AUTO_CALIBRATE "Calibrarea automată este activă" +#define D_OOBE_CALIBRATED "Deja calibrat" -#define D_JSON_FAILED "Analiza JSON a eșuat:" -#define D_JSONL_FAILED "Analiza JSONL a eșuat la linia %d" -#define D_JSONL_SUCCEEDED "Analiza JSONL completă" +#define D_DISPATCH_COMMAND_NOT_FOUND "Comanda %s nu a fost găsită" +#define D_DISPATCH_INVALID_PAGE "Pagina invalidă %s" +#define D_DISPATCH_REBOOT "MCU-ul repornește acum!" -#define D_OTA_CHECK_UPDATE "Verificare la URL-ul actualizărilor: %s" -#define D_OTA_CHECK_COMPLETE "Verificarea actualizării a fost finalizată" -#define D_OTA_CHECK_FAILED "Verificarea actualizării a eșuat: %s" -#define D_OTA_UPDATE_FIRMWARE "Actualizare firmware prin OTA" -#define D_OTA_UPDATE_COMPLETE "Actualizare prin OTA finalizată" -#define D_OTA_UPDATE_APPLY "Aplicarea firmware-ului și repornire" -#define D_OTA_UPDATE_FAILED "Actualizarea prin OTA a eșuat" +#define D_JSON_FAILED "Analiza JSON a eșuat:" +#define D_JSONL_FAILED "Analiza JSONL a eșuat la linia %d" +#define D_JSONL_SUCCEEDED "Analiza JSONL completă" -#define D_HTTP_HASP_DESIGN "Desenul ecranului" -#define D_HTTP_INFORMATION "Informații" -#define D_HTTP_HTTP_SETTINGS "Setări HTTP" -#define D_HTTP_WIFI_SETTINGS "Setări WiFi" -#define D_HTTP_MQTT_SETTINGS "Setări MQTT" -#define D_HTTP_GPIO_SETTINGS "Setări GPIO" -#define D_HTTP_MDNS_SETTINGS "Setări mDNS" -#define D_HTTP_TELNET_SETTINGS "Setări Telnet" -#define D_HTTP_DEBUG_SETTINGS "Setări de depanare" -#define D_HTTP_GUI_SETTINGS "Setări ecran" -#define D_HTTP_SAVE_SETTINGS "Salvarea setărilor" -#define D_HTTP_UPLOAD_FILE "Încărcare fișier" -#define D_HTTP_ERASE_DEVICE "Resetarea tuturor setărilor" -#define D_HTTP_ADD_GPIO "Adăugați un pin nou" -#define D_HTTP_BACK "Înapoi" -#define D_HTTP_REFRESH "Reîmprospătare" -#define D_HTTP_PREV_PAGE "Pagina anterioară" -#define D_HTTP_NEXT_PAGE "Pagina următoare" -#define D_HTTP_CALIBRATE "Calibrare" -#define D_HTTP_SCREENSHOT "Captură de ecran" -#define D_HTTP_FILE_BROWSER "Browser de fișiere" -#define D_HTTP_FIRMWARE_UPGRADE "Actualizare firmware" -#define D_HTTP_UPDATE_FIRMWARE "Actualizarea firmware-ului" -#define D_HTTP_FACTORY_RESET "Resetare la parametri de fabrică" -#define D_HTTP_MAIN_MENU "Meniu principal" -#define D_HTTP_REBOOT "Repornire" -#define D_HTTP_CONFIGURATION "Setări" +#define D_OTA_CHECK_UPDATE "Verificare la URL-ul actualizărilor: %s" +#define D_OTA_CHECK_COMPLETE "Verificarea actualizării a fost finalizată" +#define D_OTA_CHECK_FAILED "Verificarea actualizării a eșuat: %s" +#define D_OTA_UPDATE_FIRMWARE "Actualizare firmware prin OTA" +#define D_OTA_UPDATE_COMPLETE "Actualizare prin OTA finalizată" +#define D_OTA_UPDATE_APPLY "Aplicarea firmware-ului și repornire" +#define D_OTA_UPDATE_FAILED "Actualizarea prin OTA a eșuat" -#define D_OOBE_MSG "Atingeți ecranul pentru a configura WiFi sau conectați-vă la acest punct de acces:" -#define D_OOBE_SCAN_TO_CONNECT "Scanați pentru a vă conecta:" - -#endif +#define D_HTTP_HASP_DESIGN "Desenul ecranului" +#define D_HTTP_INFORMATION "Informații" +#define D_HTTP_HTTP_SETTINGS "Setări HTTP" +#define D_HTTP_WIFI_SETTINGS "Setări WiFi" +#define D_HTTP_MQTT_SETTINGS "Setări MQTT" +#define D_HTTP_GPIO_SETTINGS "Setări GPIO" +#define D_HTTP_MDNS_SETTINGS "Setări mDNS" +#define D_HTTP_TELNET_SETTINGS "Setări Telnet" +#define D_HTTP_DEBUG_SETTINGS "Setări de depanare" +#define D_HTTP_GUI_SETTINGS "Setări ecran" +#define D_HTTP_SAVE_SETTINGS "Salvarea setărilor" +#define D_HTTP_UPLOAD_FILE "Încărcare fișier" +#define D_HTTP_ERASE_DEVICE "Resetarea tuturor setărilor" +#define D_HTTP_ADD_GPIO "Adăugați un pin nou" +#define D_HTTP_BACK "Înapoi" +#define D_HTTP_REFRESH "Reîmprospătare" +#define D_HTTP_PREV_PAGE "Pagina anterioară" +#define D_HTTP_NEXT_PAGE "Pagina următoare" +#define D_HTTP_CALIBRATE "Calibrare" +#define D_HTTP_SCREENSHOT "Captură de ecran" +#define D_HTTP_FILE_BROWSER "Browser de fișiere" +#define D_HTTP_FIRMWARE_UPGRADE "Actualizare firmware" +#define D_HTTP_UPDATE_FIRMWARE "Actualizarea firmware-ului" +#define D_HTTP_FACTORY_RESET "Resetare la parametri de fabrică" +#define D_HTTP_MAIN_MENU "Meniu principal" +#define D_HTTP_REBOOT "Repornire" +#define D_HTTP_CONFIGURATION "Setări" + +#define D_OOBE_MSG "Atingeți ecranul pentru a configura WiFi sau conectați-vă la acest punct de acces:" +#define D_OOBE_SCAN_TO_CONNECT "Scanați pentru a vă conecta:" + +#define D_WIFI_CONNECTING_TO "$$$Connecting to %s" +#define D_WIFI_CONNECTED_TO "$$$Connected to %s, requesting IP..." + +#endif diff --git a/src/log/hasp_debug.cpp b/src/log/hasp_debug.cpp index a2c7071f..672d53ba 100644 --- a/src/log/hasp_debug.cpp +++ b/src/log/hasp_debug.cpp @@ -67,7 +67,7 @@ // static StringStream debugStream((String &)debugOutput); // extern char mqttNodeName[16]; -const char* syslogAppName = APP_NAME; +// const char* syslogAppName = APP_NAME; char debugSyslogHost[32] = SYSLOG_SERVER; uint16_t debugSyslogPort = SYSLOG_PORT; uint8_t debugSyslogFacility = 0; @@ -328,7 +328,7 @@ void debugPreSetup(JsonObject settings) debugPrintHaspHeader(&Serial); Serial.flush(); - LOG_INFO(TAG_DEBG, F("Serial started at %u baud"), baudrate); + LOG_INFO(TAG_DEBG, F(D_SERVICE_STARTED " @ %u baud"), baudrate); LOG_INFO(TAG_DEBG, F("Environment: " PIOENV)); } } diff --git a/src/sys/net/hasp_wifi.cpp b/src/sys/net/hasp_wifi.cpp index c5317871..a5158398 100644 --- a/src/sys/net/hasp_wifi.cpp +++ b/src/sys/net/hasp_wifi.cpp @@ -265,7 +265,7 @@ static void wifiDisconnected(const char* ssid, uint8_t reason) #endif default: - snprintf_P(buffer, sizeof(buffer), PSTR("unknown")); + snprintf_P(buffer, sizeof(buffer), PSTR(D_ERROR_UNKNOWN)); } LOG_WARNING(TAG_WIFI, F("Disconnected from %s (Reason: %s [%d])"), ssid, buffer, reason); @@ -273,7 +273,7 @@ static void wifiDisconnected(const char* ssid, uint8_t reason) static void wifiSsidConnected(const char* ssid) { - LOG_TRACE(TAG_WIFI, F("Connected to SSID %s. Requesting IP..."), ssid); + LOG_TRACE(TAG_WIFI, F(D_WIFI_CONNECTED_TO), ssid); wifiReconnectCounter = 0; } @@ -402,7 +402,7 @@ void wifiSetup() // int status = WL_IDLE_STATUS; // the Wifi radio's status if(!wifiShowAP()) { // while (status != WL_CONNECTED) { - LOG_TRACE(TAG_WIFI, F("Connecting to : %s"), wifiSsid); + LOG_TRACE(TAG_WIFI, F(D_WIFI_CONNECTING_TO), wifiSsid); // Connect to WPA/WPA2 network // status = WiFi.begin(wifiSsid, wifiPassword); WiFi.begin(wifiSsid, wifiPassword); @@ -426,7 +426,7 @@ void wifiSetup() #endif wifiReconnect(); - LOG_TRACE(TAG_WIFI, F("Connecting to : %s"), wifiSsid); + LOG_TRACE(TAG_WIFI, F(D_WIFI_CONNECTING_TO), wifiSsid); } #endif } @@ -473,7 +473,7 @@ bool wifiValidateSsid(const char* ssid, const char* pass) while(attempt < 15 && (WiFi.status() != WL_CONNECTED || WiFi.localIP().toString() == F("0.0.0.0"))) { #endif attempt++; - LOG_INFO(TAG_WIFI, F("Trying to connect to %s... %u"), wifiSsid, attempt); + LOG_INFO(TAG_WIFI, F(D_WIFI_CONNECTING_TO "... %u"), wifiSsid, attempt); delay(500); } #if defined(STM32F4xx) diff --git a/src/sys/svc/hasp_http.cpp b/src/sys/svc/hasp_http.cpp index b152474f..8d64d5cb 100644 --- a/src/sys/svc/hasp_http.cpp +++ b/src/sys/svc/hasp_http.cpp @@ -1875,7 +1875,7 @@ void httpHandleEspFirmware() } webSendFooter(); - LOG_TRACE(TAG_HTTP, F("Attempting ESP firmware update from: %s"), webServer.arg(url).c_str()); + LOG_TRACE(TAG_HTTP, F("Updating ESP firmware from: %s"), webServer.arg(url).c_str()); dispatch_web_update(NULL, webServer.arg(url).c_str()); } diff --git a/src/sys/svc/hasp_ota.cpp b/src/sys/svc/hasp_ota.cpp index fd113e26..d9b1c285 100644 --- a/src/sys/svc/hasp_ota.cpp +++ b/src/sys/svc/hasp_ota.cpp @@ -54,7 +54,6 @@ const char* rootCACertificate = "-----BEGIN CERTIFICATE-----\n" "PfZ+G6Z6h7mjem0Y+iWlkYcV4PIWL1iwBi8saCbGS5jN2p8M+X+Q7UNKEkROb3N6\n" "KOqkqm57TH2H3eDJAkSnh6/DNFu0Qg==\n" "-----END CERTIFICATE-----\n"; - #endif static WiFiClient otaClient; @@ -106,8 +105,10 @@ bool otaUpdateCheck() static inline void otaProgress(void) { - LOG_VERBOSE(TAG_OTA, F("%s update in progress... %3u%"), - (ArduinoOTA.getCommand() == U_FLASH ? PSTR("Firmware") : PSTR("Filesystem")), otaPrecentageComplete); + LOG_VERBOSE(TAG_OTA, F("%s %3u%"), + (ArduinoOTA.getCommand() == U_FLASH ? PSTR("Firmware update in progress...") + : PSTR("Filesystem update in progress...")), + otaPrecentageComplete); } void otaOnProgress(unsigned int progress, unsigned int total) @@ -148,29 +149,29 @@ void otaSetup(void) }); ArduinoOTA.onProgress(otaOnProgress); ArduinoOTA.onError([](ota_error_t error) { - char buffer[16]; + char buffer[32]; switch(error) { case OTA_AUTH_ERROR: - snprintf_P(buffer, sizeof(buffer), PSTR("Auth")); + snprintf_P(buffer, sizeof(buffer), PSTR("Auth failed")); break; case OTA_BEGIN_ERROR: - snprintf_P(buffer, sizeof(buffer), PSTR("Begin")); + snprintf_P(buffer, sizeof(buffer), PSTR("Begin failed")); break; case OTA_CONNECT_ERROR: - snprintf_P(buffer, sizeof(buffer), PSTR("Connect")); + snprintf_P(buffer, sizeof(buffer), PSTR("Connect failed")); break; case OTA_RECEIVE_ERROR: - snprintf_P(buffer, sizeof(buffer), PSTR("Receive")); + snprintf_P(buffer, sizeof(buffer), PSTR("Receive failed")); break; case OTA_END_ERROR: - snprintf_P(buffer, sizeof(buffer), PSTR("End")); + snprintf_P(buffer, sizeof(buffer), PSTR("End failed")); break; default: - snprintf_P(buffer, sizeof(buffer), PSTR("Something")); + snprintf_P(buffer, sizeof(buffer), PSTR("Unknown Error")); } otaPrecentageComplete = -1; - LOG_ERROR(TAG_OTA, F("%s failed (%s)"), buffer, error); + LOG_ERROR(TAG_OTA, F("%s (%d)"), buffer, error); haspProgressMsg(F(D_OTA_UPDATE_FAILED)); // delay(5000); });