# HG changeset patch # User Michiel Broek # Date 1573499575 -3600 # Node ID 106464d4c72747ca14948a1a1ab36241c1ea72cb # Parent 6d825e2962e4875b272efb4a773433fd599e5b2a Dutch translation on the screens. diff -r 6d825e2962e4 -r 106464d4c727 main/task_user.c --- a/main/task_user.c Mon Nov 11 16:54:12 2019 +0100 +++ b/main/task_user.c Mon Nov 11 20:12:55 2019 +0100 @@ -328,8 +328,8 @@ screen_top("CO2 meter %s", app_desc->version); u8g2_SetFont(&u8g2, u8g2_font_t0_22b_tf); - u8g2_uint_t w = u8g2_GetUTF8Width(&u8g2, "START"); - u8g2_DrawUTF8(&u8g2, (128 - w) / 2,50, "START"); + u8g2_uint_t w = u8g2_GetUTF8Width(&u8g2, "Welkom"); + u8g2_DrawUTF8(&u8g2, (128 - w) / 2,50, "Welkom"); u8g2_SendBuffer(&u8g2); u8g2_SetPowerSave(&u8g2, 0); // wake up display @@ -380,7 +380,7 @@ if (xSemaphoreTake(xSemaphoreUnits, 35) == pdTRUE) { - screen_top("Unit %d %s", no + 1, units[no].mode ? "On":"Off"); + screen_top("Meter %d %s", no + 1, units[no].mode ? "Aan":"Uit"); u8g2_SetFont(&u8g2, u8g2_font_t0_22b_tf); sprintf(buf, "%.1f °C", units[no].temperature / 1000.0); @@ -407,10 +407,10 @@ */ void screen_unit_zero(int no, int sub) { - screen_top("Unit %d zeroset", no + 1); - menu_line( 0, 2, 25, "Current %d", units[no].pressure_zero); - menu_line(sub == 0, 2, 37, "New value %d", units[no].pressure_voltage / (adc_state->Batt_voltage / 1000)); - menu_line(sub == 1, 2, 49, "Return"); + screen_top("Meter %d nulpunt", no + 1); + menu_line( 0, 2, 25, "Huidig %d", units[no].pressure_zero); + menu_line(sub == 0, 2, 37, "Nieuw %d", units[no].pressure_voltage / (adc_state->Batt_voltage / 1000)); + menu_line(sub == 1, 2, 49, "Terug"); u8g2_SendBuffer(&u8g2); } @@ -423,11 +423,11 @@ */ void screen_unit_setup(int no, int sub) { - screen_top("Unit %d setup", no + 1); - menu_line(sub == 0, 2, 25, "Mode %s", units[no].mode ? "ON":"OFF"); - menu_line(sub == 1, 2, 37, "Zero %d", units[no].pressure_zero); + screen_top("Meter %d setup", no + 1); + menu_line(sub == 0, 2, 25, "Werking %s", units[no].mode ? "Aan":"Uit"); + menu_line(sub == 1, 2, 37, "Nulpunt %d", units[no].pressure_zero); menu_line(sub == 2, 2, 49, "DS18B20 %s", units[no].temperature_rom_code); - menu_line(sub == 3, 2, 61, "Return"); + menu_line(sub == 3, 2, 61, "Terug"); u8g2_SendBuffer(&u8g2); } @@ -443,7 +443,7 @@ u8g2_DrawStr(&u8g2, 1, 28, buf); snprintf(buf, 65, "RSSI %d", wifi_state->STA_rssi); u8g2_DrawStr(&u8g2, 1, 43, buf); - snprintf(buf, 65, "Online %s", wifi_state->STA_online ? "Yes":"No"); + snprintf(buf, 65, "Verbonden %s", wifi_state->STA_online ? "Ja":"Nee"); u8g2_DrawStr(&u8g2, 1, 59, buf); u8g2_SendBuffer(&u8g2); xSemaphoreGive(xSemaphoreWiFi); @@ -469,11 +469,11 @@ void screen_network() { if (xSemaphoreTake(xSemaphoreWiFi, 25) == pdTRUE) { - screen_top("Network Status"); + screen_top("Netwerk Status"); menu_line(0, 1, 25, "IP %s", wifi_state->STA_ip); menu_line(0, 1, 37, "Mask %s", wifi_state->STA_nm); menu_line(0, 1, 49, "GW %s", wifi_state->STA_gw); - menu_line(0, 1, 61, "Name %s", config.hostname); + menu_line(0, 1, 61, "Naam %s", config.hostname); u8g2_SendBuffer(&u8g2); xSemaphoreGive(xSemaphoreWiFi); } else { @@ -485,10 +485,10 @@ void screen_network_setup(int sub) { - screen_top("Network setup"); - menu_line(sub == 0, 2, 25, "Name %s", config.hostname); + screen_top("Netwerk setup"); + menu_line(sub == 0, 2, 25, "Naam %s", config.hostname); menu_line(sub == 1, 2, 37, "NTP %s", config.ntp_server); - menu_line(sub == 2, 2, 49, "Return"); + menu_line(sub == 2, 2, 49, "Terug"); u8g2_SendBuffer(&u8g2); } @@ -511,7 +511,7 @@ menu_line(sub == 0, 2, 25, "serv %s", config.mqtt_server); menu_line(sub == 1, 2, 37, "port %d", config.mqtt_port); menu_line(sub == 2, 2, 49, "user %s", config.mqtt_user); - menu_line(sub == 3, 2, 61, "Return"); + menu_line(sub == 3, 2, 61, "Terug"); u8g2_SendBuffer(&u8g2); } @@ -519,8 +519,8 @@ void screen_update() { - screen_top("Update firmware"); - menu_line(0, 1, 43, "Push to update"); + screen_top("Update software"); + menu_line(0, 1, 43, "Druk voor update"); u8g2_SendBuffer(&u8g2); } @@ -528,7 +528,7 @@ void screen_updating(char *m1, char *m2) { - screen_top("Updating ..."); + screen_top("Bijwerken ..."); u8g2_SetFont(&u8g2, u8g2_font_unifont_t_symbols); if (m1) { u8g2_DrawUTF8(&u8g2,2,30, m1); @@ -834,7 +834,7 @@ case ML2_SETUP_NETWORK: if (SubMenu == 0) { - rotary_editer("Hostname", config.hostname, "", 16, EDIT_TYPE_TEXT); + rotary_editer("Hostnaam", config.hostname, "", 16, EDIT_TYPE_TEXT); screen_network_setup(SubMenu); } if (SubMenu == 1) { diff -r 6d825e2962e4 -r 106464d4c727 main/updates.c --- a/main/updates.c Mon Nov 11 16:54:12 2019 +0100 +++ b/main/updates.c Mon Nov 11 20:12:55 2019 +0100 @@ -37,7 +37,7 @@ ESP_LOGI(TAG, "Update begin"); update_running = 1; - screen_updating("Stop tests", NULL); + screen_updating("Stop meten", NULL); for (;;) { vTaskDelay(100 / portTICK_PERIOD_MS); @@ -50,9 +50,8 @@ goto updateerr; } } - screen_updating("Tests stopped", NULL); - screen_updating("Stop tests", "Start WiFi"); + screen_updating("Stop meten", "Start WiFi"); requestWiFi_user(true); timeout = 600; for (;;) { @@ -67,7 +66,7 @@ } } ESP_LOGI(TAG, "System is ready for update"); - screen_updating("Prepare update", NULL); + screen_updating("Verbonden", NULL); const esp_partition_t *running = esp_ota_get_running_partition(); @@ -154,7 +153,7 @@ } if (memcmp(new_app_info.app_elf_sha256, running_app_info.app_elf_sha256, 32) == 0) { - screen_updating("No new update", NULL); + screen_updating("Geen nieuwe versie", NULL); ESP_LOGI(TAG, "Current running version is the same as a new."); http_cleanup(client); goto updateok; @@ -211,14 +210,14 @@ } ESP_LOGI(TAG, "Prepare to restart system!"); - screen_updating("Reboot...", "...Reboot"); + screen_updating("Herstar ...", "... Herstart"); vTaskDelay(1000 / portTICK_PERIOD_MS); update_running = 0; esp_restart(); return; updateerr: - screen_updating("** ERROR **", "Update failed"); + screen_updating("** FOUT **", "Update mislukt"); updateok: update_running = 0;