From 6bc9acf20080f92361501b68c555864a5757012e Mon Sep 17 00:00:00 2001 From: proddy Date: Sat, 10 Oct 2020 18:01:52 +0200 Subject: [PATCH] standardize text to be capitalzed --- src/locale_EN.h | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/src/locale_EN.h b/src/locale_EN.h index 604794d76..eb0ea3589 100644 --- a/src/locale_EN.h +++ b/src/locale_EN.h @@ -96,7 +96,6 @@ MAKE_PSTR_WORD(sensor) MAKE_PSTR(kwh, "kWh") MAKE_PSTR(wh, "Wh") -MAKE_PSTR(hc_optional, "[heating circuit]") MAKE_PSTR(master_thermostat_fmt, "Master Thermostat Device ID = %s") MAKE_PSTR(host_fmt, "Host = %s") MAKE_PSTR(hostname_fmt, "WiFi Hostname = %s") @@ -116,7 +115,7 @@ MAKE_PSTR(percent, "%") MAKE_PSTR(degrees, "°C") MAKE_PSTR(asterisks, "********") MAKE_PSTR(n_mandatory, "") -MAKE_PSTR(id_optional, "[id/hc]") +MAKE_PSTR(id_optional, "[id|hc]") MAKE_PSTR(data_optional, "[data]") MAKE_PSTR(typeid_mandatory, "") MAKE_PSTR(deviceid_mandatory, "") @@ -136,10 +135,10 @@ MAKE_PSTR(icontemperature, "mdi:coolant-temperature") MAKE_PSTR(iconpercent, "mdi:sine-wave") // boiler -MAKE_PSTR(heatingActive, "Heating Active") -MAKE_PSTR(tapwaterActive, "Warm water/DHW Active") -MAKE_PSTR(serviceCode, "Service Code") -MAKE_PSTR(serviceCodeNumber, "Service Code Number") +MAKE_PSTR(heatingActive, "Heating active") +MAKE_PSTR(tapwaterActive, "Warm water/DHW active") +MAKE_PSTR(serviceCode, "Service code") +MAKE_PSTR(serviceCodeNumber, "Service code number") MAKE_PSTR(wWSelTemp, "Warm water selected temperature") MAKE_PSTR(wWSetTemp, "Warm water set temperature") MAKE_PSTR(wWDisinfectionTemp, "Warm water disinfection temperature") @@ -149,7 +148,7 @@ MAKE_PSTR(curBurnPow, "Burner current power") MAKE_PSTR(pumpMod, "Pump modulation") MAKE_PSTR(pumpMod2, "Heat pump modulation") MAKE_PSTR(wWType, "Warm water type") -MAKE_PSTR(wWChargeType, "Warm Water charging type") +MAKE_PSTR(wWChargeType, "Warm water charging type") MAKE_PSTR(wWCircPump, "Warm water circulation pump available") MAKE_PSTR(wWCircPumpMode, "Warm water circulation pump freq") MAKE_PSTR(wWCirc, "Warm water circulation active") @@ -171,7 +170,7 @@ MAKE_PSTR(wWDisinfecting, "Warm water disinfecting") MAKE_PSTR(wWCharging, "Warm water charging") MAKE_PSTR(wWRecharging, "Warm water recharging") MAKE_PSTR(wWTempOK, "Warm water temperature ok") -MAKE_PSTR(wWActive, "Warm water active") +MAKE_PSTR(wWActive, "Warm water activated") MAKE_PSTR(burnGas, "Gas") MAKE_PSTR(flameCurr, "Flame current") MAKE_PSTR(heatPump, "Boiler pump") @@ -188,7 +187,7 @@ MAKE_PSTR(burnMinPower, "Boiler burner min power") MAKE_PSTR(burnMaxPower, "Boiler burner max power") MAKE_PSTR(boilHystOn, "Boiler temperature hysteresis on") MAKE_PSTR(boilHystOff, "Boiler temperature hysteresis off") -MAKE_PSTR(setFlowTemp, "Set Flow temperature") +MAKE_PSTR(setFlowTemp, "Set flow temperature") MAKE_PSTR(wWSetPumpPower, "Warm water pump set power") MAKE_PSTR(wwMixTemperature, "Warm water mix temperature") MAKE_PSTR(wwBufferBoilerTemperature, "Warm water buffer boiler temperature") @@ -208,17 +207,17 @@ MAKE_PSTR(pumpWorkMin, "Pump working time") MAKE_PSTR(energyLastHour, "Energy last hour") MAKE_PSTR(energyToday, "Energy today") MAKE_PSTR(energyTotal, "Energy total") -MAKE_PSTR(solarPump, "Solar Pump (PS1) active") +MAKE_PSTR(solarPump, "Solar pump (PS1) active") MAKE_PSTR(valveStatus, "Valve status") -MAKE_PSTR(tankHeated, "Tank Heated") +MAKE_PSTR(tankHeated, "Tank heated") MAKE_PSTR(collectorShutdown, "Collector shutdown") // mixing -MAKE_PSTR(ww_hc, " Warm Water Circuit %d:") +MAKE_PSTR(ww_hc, " Warm water circuit %d:") MAKE_PSTR(wwTemp, "Current warm water temperature") MAKE_PSTR(pumpStatus, "Current pump status") MAKE_PSTR(tempStatus, "Current temperature status") -MAKE_PSTR(hc, " Heating Circuit %d:") +MAKE_PSTR(hc, " Heating circuit %d:") MAKE_PSTR(flowTemp, "Current flow temperature") MAKE_PSTR(flowSetTemp, "Setpoint flow temperature") @@ -236,7 +235,7 @@ MAKE_PSTR(building, "Building") MAKE_PSTR(wwmode, "Warm water mode") MAKE_PSTR(wwtemp, "Warm water high temperature") MAKE_PSTR(wwtemplow, "Warm water low temperature") -MAKE_PSTR(wwcircmode, "Warm Water circulation mode") +MAKE_PSTR(wwcircmode, "Warm water circulation mode") // thermostat - per heating circuit MAKE_PSTR(seltemp, "Setpoint room temperature")