diff --git a/CHANGELOG_LATEST.md b/CHANGELOG_LATEST.md index 026b327d3..734d7bff2 100644 --- a/CHANGELOG_LATEST.md +++ b/CHANGELOG_LATEST.md @@ -9,7 +9,7 @@ ## Added -- Translations in Web UI and all device entity names (DE, NL, SE, PL, NO, FR) [#22](https://github.com/emsesp/EMS-ESP32/issues/22) +- Translations in Web UI and all device entity names (DE, NL, SV, PL, NO, FR) [#22](https://github.com/emsesp/EMS-ESP32/issues/22) - Add support for Lolin C3 mini [#620](https://github.com/emsesp/EMS-ESP32/pull/620) - Add support for ESP32-S2 [#667](https://github.com/emsesp/EMS-ESP32/pull/667) - Add devices: Greenstar 30Ri boiler, Junkers FW500 thermostat, Buderus BC30 controller diff --git a/interface/package-lock.json b/interface/package-lock.json index a95807a64..d335d4031 100644 --- a/interface/package-lock.json +++ b/interface/package-lock.json @@ -25,7 +25,6 @@ "jwt-decode": "^3.1.2", "lodash": "^4.17.21", "notistack": "^2.0.8", - "parse-ms": "^3.0.0", "react": "^18.2.0", "react-app-rewired": "^2.2.1", "react-dom": "^18.2.0", @@ -2253,9 +2252,9 @@ "integrity": "sha512-AHPmaAx+RYfZz0eYu6Gviiagpmiyw98ySSlQvCUhVGDRtDFe4DBS0x1bSjdF3gqUDYOczB+yYvBTtEylYSdRhg==" }, "node_modules/@eslint/eslintrc": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.0.tgz", - "integrity": "sha512-7yfvXy6MWLgWSFsLhz5yH3iQ52St8cdUY6FoGieKkRDVxuxmrNuUetIuu6cmjNWwniUHiWXjxCr5tTXDrbYS5A==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.1.tgz", + "integrity": "sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==", "dependencies": { "ajv": "^6.12.4", "debug": "^4.3.2", @@ -3943,9 +3942,9 @@ } }, "node_modules/@types/express-serve-static-core": { - "version": "4.17.31", - "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.31.tgz", - "integrity": "sha512-DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q==", + "version": "4.17.32", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.32.tgz", + "integrity": "sha512-aI5h/VOkxOF2Z1saPy0Zsxs5avets/iaiAJYznQFm5By/pamU31xWKL//epiF4OfUA2qTOc9PV6tCUjhO8wlZA==", "dependencies": { "@types/node": "*", "@types/qs": "*", @@ -7072,11 +7071,11 @@ } }, "node_modules/eslint": { - "version": "8.30.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.30.0.tgz", - "integrity": "sha512-MGADB39QqYuzEGov+F/qb18r4i7DohCDOfatHaxI2iGlPuC65bwG2gxgO+7DkyL38dRFaRH7RaRAgU6JKL9rMQ==", + "version": "8.31.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.31.0.tgz", + "integrity": "sha512-0tQQEVdmPZ1UtUKXjX7EMm9BlgJ08G90IhWh0PKDCb3ZLsgAOHI8fYSIzYVZej92zsgq+ft0FGsxhJ3xo2tbuA==", "dependencies": { - "@eslint/eslintrc": "^1.4.0", + "@eslint/eslintrc": "^1.4.1", "@humanwhocodes/config-array": "^0.11.8", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", @@ -11661,9 +11660,9 @@ "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==" }, "node_modules/json5": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.2.tgz", - "integrity": "sha512-46Tk9JiOL2z7ytNQWFLpj99RZkVgeHf87yGQKsIkaPz1qSH9UczKH1rO7K3wgRselo0tYMUNfecYpm/p1vC7tQ==", + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", + "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", "bin": { "json5": "lib/cli.js" }, @@ -12719,17 +12718,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/parse-ms": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-3.0.0.tgz", - "integrity": "sha512-Tpb8Z7r7XbbtBTrM9UhpkzzaMrqA2VXMT3YChzYltwV3P3pM6t8wl7TvpMnSTosz1aQAdVib7kdoys7vYOPerw==", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/parse5": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", @@ -16476,9 +16464,9 @@ } }, "node_modules/tsconfig-paths/node_modules/json5": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", - "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", + "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", "dependencies": { "minimist": "^1.2.0" }, diff --git a/interface/package.json b/interface/package.json index 3d885ba97..058f14c40 100644 --- a/interface/package.json +++ b/interface/package.json @@ -21,7 +21,6 @@ "jwt-decode": "^3.1.2", "lodash": "^4.17.21", "notistack": "^2.0.8", - "parse-ms": "^3.0.0", "react": "^18.2.0", "react-app-rewired": "^2.2.1", "react-dom": "^18.2.0", diff --git a/interface/src/SignIn.tsx b/interface/src/SignIn.tsx index 4cda65dec..106754b9f 100644 --- a/interface/src/SignIn.tsx +++ b/interface/src/SignIn.tsx @@ -21,7 +21,7 @@ import { loadLocaleAsync } from './i18n/i18n-util.async'; import { ReactComponent as NLflag } from './i18n/NL.svg'; import { ReactComponent as DEflag } from './i18n/DE.svg'; import { ReactComponent as GBflag } from './i18n/GB.svg'; -import { ReactComponent as SEflag } from './i18n/SE.svg'; +import { ReactComponent as SVflag } from './i18n/SV.svg'; import { ReactComponent as PLflag } from './i18n/PL.svg'; import { ReactComponent as NOflag } from './i18n/NO.svg'; import { ReactComponent as FRflag } from './i18n/FR.svg'; @@ -134,9 +134,9 @@ const SignIn: FC = () => {  PL - diff --git a/interface/src/components/layout/LayoutAuthMenu.tsx b/interface/src/components/layout/LayoutAuthMenu.tsx index fcfe92034..609220690 100644 --- a/interface/src/components/layout/LayoutAuthMenu.tsx +++ b/interface/src/components/layout/LayoutAuthMenu.tsx @@ -26,7 +26,7 @@ import { loadLocaleAsync } from '../../i18n/i18n-util.async'; import { ReactComponent as NLflag } from '../../i18n/NL.svg'; import { ReactComponent as DEflag } from '../../i18n/DE.svg'; import { ReactComponent as GBflag } from '../../i18n/GB.svg'; -import { ReactComponent as SEflag } from '../../i18n/SE.svg'; +import { ReactComponent as SVflag } from '../../i18n/SV.svg'; import { ReactComponent as PLflag } from '../../i18n/PL.svg'; import { ReactComponent as NOflag } from '../../i18n/NO.svg'; import { ReactComponent as FRflag } from '../../i18n/FR.svg'; @@ -99,9 +99,9 @@ const LayoutAuthMenu: FC = () => {  PL - - -  SE + + +  SV diff --git a/interface/src/i18n/SE.svg b/interface/src/i18n/SV.svg similarity index 100% rename from interface/src/i18n/SE.svg rename to interface/src/i18n/SV.svg diff --git a/interface/src/i18n/de/index.ts b/interface/src/i18n/de/index.ts index f2b67ea17..4b15e4ec9 100644 --- a/interface/src/i18n/de/index.ts +++ b/interface/src/i18n/de/index.ts @@ -234,7 +234,7 @@ const de: Translation = { OPTIONAL: 'Optional', FORMATTING: 'Formattierung', MQTT_FORMAT: 'Topic/Payload Format', - MQTT_NEST_1: 'Als Nester in in einem Gesamttopic', + MQTT_NEST_1: 'Eingebettet in einem Gesamttopic', MQTT_NEST_2: 'Als einzelne Topics', MQTT_RESPONSE: 'Veröffentliche die Kommandoantwort als `response` Topic', MQTT_PUBLISH_TEXT_1: 'Veröffentliche einzelne Werte bei Veränderung als eigene Topics', diff --git a/interface/src/i18n/se/index.ts b/interface/src/i18n/sv/index.ts similarity index 98% rename from interface/src/i18n/se/index.ts rename to interface/src/i18n/sv/index.ts index c03e0e136..ccad2f222 100644 --- a/interface/src/i18n/se/index.ts +++ b/interface/src/i18n/sv/index.ts @@ -2,7 +2,7 @@ import type { Translation } from '../i18n-types'; /* prettier-ignore */ /* eslint-disable */ -const se: Translation = { +const sv: Translation = { LANGUAGE: 'Språk', RETRY: 'Försök igen', LOADING: 'Laddar', @@ -77,7 +77,7 @@ const se: Translation = { TX_ISSUES: 'Sändfel - Prova ett annat TX-läge', DISCONNECTED: 'Nedkopplad', EMS_SCAN: 'Är du säker att du vill initiera en full genomsökning av EMS-bussen?', - EMS_BUS_STATUS: 'EMS-Buss Status', + EMS_BUS_STATUS: 'Status EMS-Buss', ACTIVE_DEVICES: 'Aktiva Enheter', EMS_DEVICE: 'EMS Enhet', SUCCESS: 'Lyckades', @@ -87,7 +87,7 @@ const se: Translation = { EMS_BUS_STATUS_TITLE: 'EMS-buss & aktivitetsstatus', SCAN: 'Sök', STATUS_NAMES: [ - 'EMS-mottagningar (Rx)', + 'EMS-telegram (Rx)', 'EMS-läsningar (Tx)', 'EMS-skrivningar (Tx)', 'Temperatursensor-läsningar', @@ -117,7 +117,7 @@ const se: Translation = { DISABLED: 'inaktiverad', TX_MODE: 'Tx Mode', HARDWARE: 'Hardware', - EMS_BUS: '{{BUS|EMS BUS}}', + EMS_BUS: '{{BUSS|EMS-BUSS}}', GENERAL_OPTIONS: 'Allmänna Inställningar', LANGUAGE_ENTITIES: 'Språk (för entiteter)', HIDE_LED: 'Inaktivera LED', @@ -140,7 +140,7 @@ const se: Translation = { LOGGING: 'Loggning', LOG_HEX: 'Logga EMS-telegram i hexadecimal', ENABLE_SYSLOG: 'Aktivera Syslog', - LOG_LEVEL: 'Log Level', + LOG_LEVEL: 'Loggnivå', MARK_INTERVAL: 'Markerings-interval', SECONDS: 'sekunder', MINUTES: 'minuter', @@ -260,8 +260,8 @@ const se: Translation = { UNKNOWN: 'Okänt', SET_TIME: 'Ställ in klockan', SET_TIME_TEXT: 'Ange lokal datum och tid nedan för att ställa in klockan', - LOCAL_TIME: 'Lokal Tid', - UTC_TIME: 'UTC-tid', + LOCAL_TIME: 'Tid (lokal)', + UTC_TIME: 'Tid (UTC)', ENABLE_NTP: 'Aktivera NTP', NTP_SERVER: 'NTP Server', TIME_ZONE: 'Tidszon', @@ -305,4 +305,4 @@ const se: Translation = { MAX: 'max' }; -export default se; +export default sv; \ No newline at end of file diff --git a/interface/src/project/DashboardData.tsx b/interface/src/project/DashboardData.tsx index ee0d61e6e..0c780e7c2 100644 --- a/interface/src/project/DashboardData.tsx +++ b/interface/src/project/DashboardData.tsx @@ -74,8 +74,6 @@ import { import { useI18nContext } from '../i18n/i18n-react'; -import parseMilliseconds from 'parse-ms'; - const DashboardData: FC = () => { const { me } = useContext(AuthenticatedContext); @@ -401,7 +399,10 @@ const DashboardData: FC = () => { const isCmdOnly = (dv: DeviceValue) => dv.v === '' && dv.c; const formatDurationMin = (duration_min: number) => { - const { days, hours, minutes } = parseMilliseconds(duration_min * 60000); + const days = Math.trunc((duration_min * 60000) / 86400000); + const hours = Math.trunc((duration_min * 60000) / 3600000) % 24; + const minutes = Math.trunc((duration_min * 60000) / 60000) % 60; + let formatted = ''; if (days) { formatted += LL.NUM_DAYS({ num: days }) + ' '; diff --git a/interface/src/project/DashboardStatus.tsx b/interface/src/project/DashboardStatus.tsx index 09bd43f6f..9b2db3ca4 100644 --- a/interface/src/project/DashboardStatus.tsx +++ b/interface/src/project/DashboardStatus.tsx @@ -38,7 +38,6 @@ import * as EMSESP from './api'; import type { Translation } from '../i18n/i18n-types'; import { useI18nContext } from '../i18n/i18n-react'; -import parseMilliseconds from 'parse-ms'; export const isConnected = ({ status }: Status) => status !== busConnectionStatus.BUS_STATUS_OFFLINE; @@ -157,7 +156,11 @@ const DashboardStatus: FC = () => { }; const formatDurationSec = (duration_sec: number) => { - const { days, hours, minutes, seconds } = parseMilliseconds(duration_sec * 1000); + const days = Math.trunc((duration_sec * 1000) / 86400000); + const hours = Math.trunc((duration_sec * 1000) / 3600000) % 24; + const minutes = Math.trunc((duration_sec * 1000) / 60000) % 60; + const seconds = Math.trunc((duration_sec * 1000) / 1000) % 60; + let formatted = ''; if (days) { formatted += LL.NUM_DAYS({ num: days }) + ' '; diff --git a/interface/src/project/SettingsApplication.tsx b/interface/src/project/SettingsApplication.tsx index 20f642281..b72f511cf 100644 --- a/interface/src/project/SettingsApplication.tsx +++ b/interface/src/project/SettingsApplication.tsx @@ -368,7 +368,7 @@ const SettingsApplication: FC = () => { Nederlands (NL) Norsk (NO) Polski (PL) - Svenska (SE) + Svenska (SV) {data.led_gpio !== 0 && ( diff --git a/src/locale_translations.h b/src/locale_translations.h index a6c3f0ae3..f96c78dee 100644 --- a/src/locale_translations.h +++ b/src/locale_translations.h @@ -24,12 +24,12 @@ #define EMSESP_LOCALE_EN "en" #define EMSESP_LOCALE_DE "de" #define EMSESP_LOCALE_NL "nl" -#define EMSESP_LOCALE_SE "se" +#define EMSESP_LOCALE_SV "sv" #define EMSESP_LOCALE_PL "pl" #define EMSESP_LOCALE_NO "no" #define EMSESP_LOCALE_FR "fr" -// translations are in order en, de, nl, se, pl, no, fr, .... +// translations are in order en, de, nl, sv, pl, no, fr, .... // if there is no translation, it will default to en // commands @@ -54,44 +54,44 @@ MAKE_PSTR_LIST(test_cmd, "run a test") // mqtt tags must not have spaces MAKE_PSTR_LIST(tag_none, "") MAKE_PSTR_LIST(tag_heartbeat, "") -MAKE_PSTR_LIST(tag_boiler_data_ww, "dhw", "WW", "dhw", "dhw", "CWU", "dhw", "ecs") +MAKE_PSTR_LIST(tag_boiler_data_ww, "dhw", "WW", "dhw", "VV", "CWU", "dhw", "ecs") MAKE_PSTR_LIST(tag_device_data, "") -MAKE_PSTR_LIST(tag_device_data_ww, "dhw", "WW", "dhw", "dhw", "CWU", "dhw", "ecs") -MAKE_PSTR_LIST(tag_hc1, "hc1", "HK1", "hc1", "hc1", "OG1", "hc1", "hc1") -MAKE_PSTR_LIST(tag_hc2, "hc2", "HK2", "hc2", "hc2", "OG2", "hc2", "hc2") -MAKE_PSTR_LIST(tag_hc3, "hc3", "HK3", "hc3", "hc3", "OG3", "hc3", "hc3") -MAKE_PSTR_LIST(tag_hc4, "hc4", "HK4", "hc4", "hc4", "OG4", "hc4", "hc4") -MAKE_PSTR_LIST(tag_hc5, "hc5", "HK5", "hc5", "hc5", "OG5", "hc5", "hc5") -MAKE_PSTR_LIST(tag_hc6, "hc6", "HK6", "hc6", "hc6", "OG6", "hc6", "hc6") -MAKE_PSTR_LIST(tag_hc7, "hc7", "HK7", "hc7", "hc7", "OG7", "hc7", "hc7") -MAKE_PSTR_LIST(tag_hc8, "hc8", "HK8", "hc8", "hc8", "OG8", "hc8", "hc8") -MAKE_PSTR_LIST(tag_wwc1, "wwc1", "WWK1", "wwc1", "wwc1", "CWU1", "wwc1", "wwc1") -MAKE_PSTR_LIST(tag_wwc2, "wwc2", "WWK2", "wwc2", "wwc2", "CWU2", "wwc2", "wwc2") -MAKE_PSTR_LIST(tag_wwc3, "wwc3", "WWK3", "wwc3", "wwc3", "CWU3", "wwc3", "wwc3") -MAKE_PSTR_LIST(tag_wwc4, "wwc4", "WWK4", "wwc4", "wwc4", "CWU4", "wwc4", "wwc4") -MAKE_PSTR_LIST(tag_wwc5, "wwc5", "WWK5", "wwc5", "wwc5", "CWU5", "wwc5", "wwc5") -MAKE_PSTR_LIST(tag_wwc6, "wwc6", "WWK6", "wwc6", "wwc6", "CWU6", "wwc6", "wwc6") -MAKE_PSTR_LIST(tag_wwc7, "wwc7", "WWK7", "wwc7", "wwc7", "CWU7", "wwc7", "wwc7") -MAKE_PSTR_LIST(tag_wwc8, "wwc8", "WWK8", "wwc8", "wwc8", "CWU8", "wwc8", "wwc8") -MAKE_PSTR_LIST(tag_wwc9, "wwc9", "WWK9", "wwc9", "wwc9", "CWU9", "wwc9", "wwc9") -MAKE_PSTR_LIST(tag_wwc10, "wwc10", "WWK10", "wwc10", "wwc10", "CWU10", "wwc10", "wwc10") -MAKE_PSTR_LIST(tag_ahs1, "ahs1", "ahs1", "ahs1", "ahs1", "AŹC1", "ahs1", "ahs1") -MAKE_PSTR_LIST(tag_hs1, "hs1", "hs1", "hs1", "hs1", "ŹC1", "hs1", "hs1") -MAKE_PSTR_LIST(tag_hs2, "hs2", "hs2", "hs2", "hs2", "ŹC2", "hs2", "hs2") -MAKE_PSTR_LIST(tag_hs3, "hs3", "hs3", "hs3", "hs3", "ŹC3", "hs3", "hs3") -MAKE_PSTR_LIST(tag_hs4, "hs4", "hs4", "hs4", "hs4", "ŹC4", "hs4", "hs4") -MAKE_PSTR_LIST(tag_hs5, "hs5", "hs5", "hs5", "hs5", "ŹC5", "hs5", "hs5") -MAKE_PSTR_LIST(tag_hs6, "hs6", "hs6", "hs6", "hs6", "ŹC6", "hs6", "hs6") -MAKE_PSTR_LIST(tag_hs7, "hs7", "hs7", "hs7", "hs7", "ŹC7", "hs7", "hs7") -MAKE_PSTR_LIST(tag_hs8, "hs8", "hs8", "hs8", "hs8", "ŹC8", "hs8", "hs8") -MAKE_PSTR_LIST(tag_hs9, "hs9", "hs9", "hs9", "hs9", "ŹC9", "hs9", "hs9") -MAKE_PSTR_LIST(tag_hs10, "hs10", "hs10", "hs10", "hs10", "ŹC10", "hs10", "hs10") -MAKE_PSTR_LIST(tag_hs11, "hs11", "hs11", "hs11", "hs11", "ŹC11", "hs11", "hs11") -MAKE_PSTR_LIST(tag_hs12, "hs12", "hs12", "hs12", "hs12", "ŹC12", "hs12", "hs12") -MAKE_PSTR_LIST(tag_hs13, "hs13", "hs13", "hs13", "hs13", "ŹC13", "hs13", "hs13") -MAKE_PSTR_LIST(tag_hs14, "hs14", "hs14", "hs14", "hs14", "ŹC14", "hs14", "hs14") -MAKE_PSTR_LIST(tag_hs15, "hs15", "hs15", "hs15", "hs15", "ŹC15", "hs15", "hs15") -MAKE_PSTR_LIST(tag_hs16, "hs16", "hs16", "hs16", "hs16", "ŹC16", "hs16", "hs16") +MAKE_PSTR_LIST(tag_device_data_ww, "dhw", "WW", "dhw", "VV", "CWU", "dhw", "ecs") +MAKE_PSTR_LIST(tag_hc1, "hc1", "HK1", "hc1", "VK1", "OG1", "hc1", "hc1") +MAKE_PSTR_LIST(tag_hc2, "hc2", "HK2", "hc2", "VK2", "OG2", "hc2", "hc2") +MAKE_PSTR_LIST(tag_hc3, "hc3", "HK3", "hc3", "VK3", "OG3", "hc3", "hc3") +MAKE_PSTR_LIST(tag_hc4, "hc4", "HK4", "hc4", "VK4", "OG4", "hc4", "hc4") +MAKE_PSTR_LIST(tag_hc5, "hc5", "HK5", "hc5", "VK5", "OG5", "hc5", "hc5") +MAKE_PSTR_LIST(tag_hc6, "hc6", "HK6", "hc6", "vk6", "OG6", "hc6", "hc6") +MAKE_PSTR_LIST(tag_hc7, "hc7", "HK7", "hc7", "VK7", "OG7", "hc7", "hc7") +MAKE_PSTR_LIST(tag_hc8, "hc8", "HK8", "hc8", "VK8", "OG8", "hc8", "hc8") +MAKE_PSTR_LIST(tag_wwc1, "wwc1", "WWK1", "wwc1", "VVK1", "CWU1", "wwc1", "wwc1") +MAKE_PSTR_LIST(tag_wwc2, "wwc2", "WWK2", "wwc2", "VVK2", "CWU2", "wwc2", "wwc2") +MAKE_PSTR_LIST(tag_wwc3, "wwc3", "WWK3", "wwc3", "VVK3", "CWU3", "wwc3", "wwc3") +MAKE_PSTR_LIST(tag_wwc4, "wwc4", "WWK4", "wwc4", "VVK4", "CWU4", "wwc4", "wwc4") +MAKE_PSTR_LIST(tag_wwc5, "wwc5", "WWK5", "wwc5", "VVK5", "CWU5", "wwc5", "wwc5") +MAKE_PSTR_LIST(tag_wwc6, "wwc6", "WWK6", "wwc6", "VVK6", "CWU6", "wwc6", "wwc6") +MAKE_PSTR_LIST(tag_wwc7, "wwc7", "WWK7", "wwc7", "VVK7", "CWU7", "wwc7", "wwc7") +MAKE_PSTR_LIST(tag_wwc8, "wwc8", "WWK8", "wwc8", "VVK8", "CWU8", "wwc8", "wwc8") +MAKE_PSTR_LIST(tag_wwc9, "wwc9", "WWK9", "wwc9", "VVK9", "CWU9", "wwc9", "wwc9") +MAKE_PSTR_LIST(tag_wwc10, "wwc10", "WWK10", "wwc10", "VVK10", "CWU10", "wwc10", "wwc10") +MAKE_PSTR_LIST(tag_ahs1, "ahs1", "AHQ1", "ahs1", "AVK1", "AŹC1", "ahs1", "ahs1") +MAKE_PSTR_LIST(tag_hs1, "hs1", "hs1", "hs1", "VK1", "ŹC1", "hs1", "hs1") +MAKE_PSTR_LIST(tag_hs2, "hs2", "hs2", "hs2", "VK2", "ŹC2", "hs2", "hs2") +MAKE_PSTR_LIST(tag_hs3, "hs3", "hs3", "hs3", "VK3", "ŹC3", "hs3", "hs3") +MAKE_PSTR_LIST(tag_hs4, "hs4", "hs4", "hs4", "VK4", "ŹC4", "hs4", "hs4") +MAKE_PSTR_LIST(tag_hs5, "hs5", "hs5", "hs5", "VK5", "ŹC5", "hs5", "hs5") +MAKE_PSTR_LIST(tag_hs6, "hs6", "hs6", "hs6", "VK6", "ŹC6", "hs6", "hs6") +MAKE_PSTR_LIST(tag_hs7, "hs7", "hs7", "hs7", "VK7", "ŹC7", "hs7", "hs7") +MAKE_PSTR_LIST(tag_hs8, "hs8", "hs8", "hs8", "VK8", "ŹC8", "hs8", "hs8") +MAKE_PSTR_LIST(tag_hs9, "hs9", "hs9", "hs9", "VK9", "ŹC9", "hs9", "hs9") +MAKE_PSTR_LIST(tag_hs10, "hs10", "hs10", "hs10", "VK10", "ŹC10", "hs10", "hs10") +MAKE_PSTR_LIST(tag_hs11, "hs11", "hs11", "hs11", "VK11", "ŹC11", "hs11", "hs11") +MAKE_PSTR_LIST(tag_hs12, "hs12", "hs12", "hs12", "VK12", "ŹC12", "hs12", "hs12") +MAKE_PSTR_LIST(tag_hs13, "hs13", "hs13", "hs13", "VK13", "ŹC13", "hs13", "hs13") +MAKE_PSTR_LIST(tag_hs14, "hs14", "hs14", "hs14", "VK14", "ŹC14", "hs14", "hs14") +MAKE_PSTR_LIST(tag_hs15, "hs15", "hs15", "hs15", "VK15", "ŹC15", "hs15", "hs15") +MAKE_PSTR_LIST(tag_hs16, "hs16", "hs16", "hs16", "VK16", "ŹC16", "hs16", "hs16") // General MAKE_PSTR_LIST(on, "on", "an", "aan", "på", "włączono", "på", "on") @@ -247,7 +247,7 @@ MAKE_PSTR_LIST(cyl2, "cyl 2", "Zyl_2", "Cil 2", "Cyl 2", "cyl 2", "cyl 2", "cyl // Entity translations // Boiler -MAKE_PSTR_LIST(wwtapactivated, "wwtapactivated", "turn on/off", "Durchlauferhitzer aktiv", "zet aan/uit", "sätt pa/av", "system przygotowywania", "slå på/av", "ecs activée") +MAKE_PSTR_LIST(wwtapactivated, "wwtapactivated", "turn on/off", "Durchlauferhitzer aktiv", "zet aan/uit", "på/av", "system przygotowywania", "slå på/av", "ecs activée") MAKE_PSTR_LIST(reset, "reset", "Reset", "Reset", "Reset", "Nollställ", "kasowanie komunikatu", "nullstill", "reset") MAKE_PSTR_LIST(oilPreHeat, "oilpreheat", "oil preheating", "Ölvorwärmung", "Olie voorverwarming", "Förvärmning olja", "podgrzewanie oleju", "oljeforvarming", "préchauffage de l'huile") MAKE_PSTR_LIST(heatingActive, "heatingactive", "heating active", "Heizen aktiv", "Verwarming actief", "Uppvärmning aktiv", "c.o. aktywne", "oppvarming aktiv", "chauffage actif") @@ -257,7 +257,7 @@ MAKE_PSTR_LIST(selBurnPow, "selburnpow", "burner selected max power", "Sollwert MAKE_PSTR_LIST(heatingPumpMod, "heatingpumpmod", "heating pump modulation", "Heizungspumpe 1 Modulation", "Modulatie verwarmingspomp", "Modulering Värmepump", "wysterowanie pompy c.o.", "varmepumpemodulering", "modulation de la pompe à chaleur") MAKE_PSTR_LIST(heatingPump2Mod, "heatingpump2mod", "heating pump 2 modulation", "Heizungspumpe 2 Modulation", "Modulatie verwarmingspomp 2", "Modulering Värmepump 2", "wysterowanie pompy c.o. 2", "varmepumpe 2 modulering", "modulation de la pompe à chaleur 2") MAKE_PSTR_LIST(outdoorTemp, "outdoortemp", "outside temperature", "Aussentemperatur", "Buitentemperatuur", "Utomhustemperatur", "temperatura zewnętrzna", "utetemperatur", "température extérieure") -MAKE_PSTR_LIST(curFlowTemp, "curflowtemp", "current flow temperature", "aktuelle Vorlauftemperatur", "Huidige aanvoertemperatuur", "Aktuell flödestemperatur", "temperatura zasilania", "aktuell strømmetemperatur", "température actuelle du flux") +MAKE_PSTR_LIST(curFlowTemp, "curflowtemp", "current flow temperature", "aktuelle Vorlauftemperatur", "Huidige aanvoertemperatuur", "Flödestemperatur", "temperatura zasilania", "aktuell strømmetemperatur", "température actuelle du flux") MAKE_PSTR_LIST(retTemp, "rettemp", "return temperature", "Rücklauftemperatur", "Retourtemperatuur", "Returtemperatur", "temperatura powrotu", "returtemperatur", "température de retour") MAKE_PSTR_LIST(switchTemp, "switchtemp", "mixing switch temperature", "Mischer Schalttemperatur", "Mixer temperatuur", "Blandartemperatur", "temperatura przełączania mieszacza", "Blandertemperatur", "température de bascule du mélangeur") MAKE_PSTR_LIST(sysPress, "syspress", "system pressure", "Systemdruck", "Systeemdruk", "Systemtryck", "ciśnienie w systemie", "systemtrykk", "pression du système") @@ -316,15 +316,15 @@ MAKE_PSTR_LIST(nrgConsCompHeating, "nrgconscompheating", "energy consumption com MAKE_PSTR_LIST(nrgConsCompWw, "nrgconscompww", "energy consumption compressor dhw", "Energieverbrauch Kompressor", "Energieverbruik compressor warmwaterbedrijf", "Energiförbrukning varmvatten", "energia pobrana przez sprężarkę na c.w.u.", "energiforbruk varmvann", "consommation énergie compresseur ecs") MAKE_PSTR_LIST(nrgConsCompCooling, "nrgconscompcooling", "energy consumption compressor cooling", "Energieverbrauch Kompressor kühlen", "Energieverbruik compressor koelbedrijf", "Energiförbrukning kyla", "energia pobrana przez sprężarkę na chłodzenie", "energiforbruk kjøling", "consommation énergie compresseur refroidissement") MAKE_PSTR_LIST(nrgConsCompPool, "nrgconscomppool", "energy consumption compressor pool", "Energieverbrauch Kompressor Pool", "Energiebedrijf compressor zwembadbedrijf", "Energiförbrukning pool", "energia pobrana przez sprężarkę na podgrzewanie basenu", "energiforbruk basseng", "consommation énergie compresseur piscine") -MAKE_PSTR_LIST(nrgSuppTotal, "nrgsupptotal", "total energy supplied", "gesamte Energieabgabe", "Totaal opgewekte energie", "Tillförd energi", "energia oddana (sumarycznie)", "tilført energi", "énergie totale fournie") -MAKE_PSTR_LIST(nrgSuppHeating, "nrgsuppheating", "total energy supplied heating", "gesamte Energieabgabe heizen", "Opgewekte energie verwarmingsbedrijf", "Tillförd energi Uppvärmning", "energia oddana na ogrzewanie", "tilført energi oppvarming", "énergie totale fournie chauffage") -MAKE_PSTR_LIST(nrgSuppWw, "nrgsuppww", "total energy warm supplied dhw", "gesamte Energieabgabe", "Opgewekte energie warmwaterbedrijf", "Tillförd energi Varmvatten", "energia oddana na c.w.u.", "tilført energi varmvann", "énergie chaude totale fournie ecs") -MAKE_PSTR_LIST(nrgSuppCooling, "nrgsuppcooling", "total energy supplied cooling", "gesamte Energieabgabe kühlen", "Opgewekte energie koelbedrijf", "Tillförd energi Kyla", "energia oddana na chłodzenie", "Tillført energi kjøling", "énergie totale fournie refroidissement") -MAKE_PSTR_LIST(nrgSuppPool, "nrgsupppool", "total energy supplied pool", "gesamte Energieabgabe Pool", "Opgewekte energie zwembadbedrijf", "TIllförd energi Pool", "energia oddana na podgrzewanie basenu", "tilført energi basseng", "énergie totale fournie piscine") -MAKE_PSTR_LIST(auxElecHeatNrgConsTotal, "auxelecheatnrgconstotal", "total auxiliary electrical heater energy consumption", "Energieverbrauch el. Zusatzheizung", "Totaal energieverbruik electrisch verwarmingselement", "Energiförbrukning Elpatron", "energia pobrana przez grzałki", "energiforbruk varmekolbe", "consommation totale énergie electrique auxiliaire chauffage") -MAKE_PSTR_LIST(auxElecHeatNrgConsHeating, "auxelecheatnrgconsheating", "auxiliary electrical heater energy consumption heating", "Energieverbrauch el. Zusatzheizung Heizen", "Energieverbruik electrisch verwarmingselement voor verwarmingsbedrijf", "Energiförbrukning Elpatron Uppvärmning", "energia pobrana przez grzałki na ogrzewanie", "energiforbruk varmekolbe oppvarming", "consommation énergie electrique auxiliaire chauffage") -MAKE_PSTR_LIST(auxElecHeatNrgConsWW, "auxelecheatnrgconsww", "auxiliary electrical heater energy consumption dhw", "Energieverbrauch el. Zusatzheizung", "Energieverbruik electrisch verwarmingselement voor warmwaterbedrijf", "Energiförbrukning Elpatron Varmvatten", "energia pobrana przez grzałki na c.w.u.", "energiförbruk varmekolbe varmvann", "consommation énergie electrique auxiliaire chauffage ecs") -MAKE_PSTR_LIST(auxElecHeatNrgConsPool, "auxelecheatnrgconspool", "auxiliary electrical heater energy consumption pool", "Energieverbrauch el. Zusatzheizung Pool", "Energieverbruik electrisch verwarmingselement voor zwembadbedrijf", "Energiförbrukning Elpatron Pool", "energia pobrana przez grzałki na podgrzewanie basenu", "", "consommation énergie electrique auxiliaire chauffage piscine") +MAKE_PSTR_LIST(nrgSuppTotal, "nrgsupptotal", "total energy supplied", "gesamte Energieabgabe", "Totaal opgewekte energie", "Genererad energi", "energia oddana (sumarycznie)", "tilført energi", "énergie totale fournie") +MAKE_PSTR_LIST(nrgSuppHeating, "nrgsuppheating", "total energy supplied heating", "gesamte Energieabgabe heizen", "Opgewekte energie verwarmingsbedrijf", "Genererad energi Uppvärmning", "energia oddana na ogrzewanie", "tilført energi oppvarming", "énergie totale fournie chauffage") +MAKE_PSTR_LIST(nrgSuppWw, "nrgsuppww", "total energy warm supplied dhw", "gesamte Energieabgabe", "Opgewekte energie warmwaterbedrijf", "Genererad energi Varmvatten", "energia oddana na c.w.u.", "tilført energi varmvann", "énergie chaude totale fournie ecs") +MAKE_PSTR_LIST(nrgSuppCooling, "nrgsuppcooling", "total energy supplied cooling", "gesamte Energieabgabe kühlen", "Opgewekte energie koelbedrijf", "Genererad energi Kyla", "energia oddana na chłodzenie", "Tillført energi kjøling", "énergie totale fournie refroidissement") +MAKE_PSTR_LIST(nrgSuppPool, "nrgsupppool", "total energy supplied pool", "gesamte Energieabgabe Pool", "Opgewekte energie zwembadbedrijf", "Genererad energi Pool", "energia oddana na podgrzewanie basenu", "tilført energi basseng", "énergie totale fournie piscine") +MAKE_PSTR_LIST(auxElecHeatNrgConsTotal, "auxelecheatnrgconstotal", "total auxiliary electrical heater energy consumption", "Energieverbrauch el. Zusatzheizung", "Totaal energieverbruik electrisch verwarmingselement", "Energiförbrukning Eltillkott", "energia pobrana przez grzałki", "energiforbruk varmekolbe", "consommation totale énergie electrique auxiliaire chauffage") +MAKE_PSTR_LIST(auxElecHeatNrgConsHeating, "auxelecheatnrgconsheating", "auxiliary electrical heater energy consumption heating", "Energieverbrauch el. Zusatzheizung Heizen", "Energieverbruik electrisch verwarmingselement voor verwarmingsbedrijf", "Energiförbrukning Eltillskott Uppvärmning", "energia pobrana przez grzałki na ogrzewanie", "energiforbruk varmekolbe oppvarming", "consommation énergie electrique auxiliaire chauffage") +MAKE_PSTR_LIST(auxElecHeatNrgConsWW, "auxelecheatnrgconsww", "auxiliary electrical heater energy consumption dhw", "Energieverbrauch el. Zusatzheizung", "Energieverbruik electrisch verwarmingselement voor warmwaterbedrijf", "Energiförbrukning Eltillskott Varmvatten", "energia pobrana przez grzałki na c.w.u.", "energiförbruk varmekolbe varmvann", "consommation énergie electrique auxiliaire chauffage ecs") +MAKE_PSTR_LIST(auxElecHeatNrgConsPool, "auxelecheatnrgconspool", "auxiliary electrical heater energy consumption pool", "Energieverbrauch el. Zusatzheizung Pool", "Energieverbruik electrisch verwarmingselement voor zwembadbedrijf", "Energiförbrukning Eltillskott Pool", "energia pobrana przez grzałki na podgrzewanie basenu", "", "consommation énergie electrique auxiliaire chauffage piscine") MAKE_PSTR_LIST(hpCompOn, "hpcompon", "hp compressor", "WP Kompressor", "WP compressor", "VP Kompressor", "sprężarka pompy ciepła", "vp kompressor", "compresseur pompe à chaleur") MAKE_PSTR_LIST(hpHeatingOn, "hpheatingon", "hp heating", "WP Heizen", "WP verwarmingsbedrijf", "VP Uppvärmning", "pompa ciepła, ogrzewanie", "vp oppvarmning", "chauffe pompe à chaleur") @@ -366,8 +366,7 @@ MAKE_PSTR_LIST(maxHeatComp, "maxheatcomp", "heat limit compressor", "Heizgrenze MAKE_PSTR_LIST(maxHeatHeat, "maxheatheat", "heat limit heating", "Heizgrenze Heizen", "heat limit heating", "heat limit heating", "ograniczenie mocy w trybie ogrzewania", "maks varmegrense oppvarming", "limite chaleur chauffage") MAKE_PSTR_LIST(maxHeatDhw, "maxheatdhw", "heat limit dhw", "Heizgrenze Warmwasser", "heat limit dhw", "heat limit dhw", "ograniczenie mocy w trybie c.w.u.", "varmegrense varmtvann", "limite chaleur ecs") -// translations missing, remember order en, de, nl, se, pl, no, fr -MAKE_PSTR_LIST(auxHeaterOff, "auxheateroff", "disable auxilliary heater", "Verbiete Zusatzheizer", "Bijverwarming uitsc", "Stäng av eltillskott", "wyłącz dogrzewacz", "", "Désactiver chauff. d'app") +MAKE_PSTR_LIST(auxHeaterOff, "auxheateroff", "disable auxilliary heater", "Verbiete Zusatzheizer", "Bijverwarming uitsc", "Blockera eltillskott", "wyłącz dogrzewacz", "", "Désactiver chauff. d'app") MAKE_PSTR_LIST(auxHeaterStatus, "auxheaterstatus", "auxilliary heater status", "Status Zusatzheizer", "Bijverwarming", "Eltillskott Status", "status dogrzewacza", "", "Chauffage auxiliaire") MAKE_PSTR_LIST(auxHeaterOnly, "auxheateronly", "auxilliary heater only", "nur Zusatzheizer","Alleen bijverwarming", "Eltillskott Enbart", "tylko dogrzewacz", "", "Que chauffage auxiliaire") MAKE_PSTR_LIST(auxHeaterDelay, "auxheaterdelay", "auxilliary heater on delay", "Zusatzheizer verzögert ein", "Bijverw. vertraagd aan", "Eltillskottfördröjning på", "opóźnienie włączania dogrzewacza", "Tilleggsvarmer forsinket på", "Chauff app tempo marche") @@ -375,9 +374,9 @@ MAKE_PSTR_LIST(silentMode, "silentmode", "silent mode", "Silentmodus", " Stiller MAKE_PSTR_LIST(minTempSilent, "mintempsilent", "min. outside temp. for silent mode", "Minimale Aussentemperatur Silentmodus", " Stiller gebruik min. buitentemp", "Tyst läge min temp", "minimalna temperatura zewnętrzna dla trybu cichego", "", "Fct silencieux: Temp. extérieure min.") MAKE_PSTR_LIST(tempParMode, "tempparmode", "outside temp. parallel mode", "Aussentemperatur Parallelmodus", "Buitentemp. parallelbedr", "Parallelläge Utomhustemp.", "maksymalna temperatura zewnętrzna dla dogrzewacza", "", "Temp. ext. fct parallèle") MAKE_PSTR_LIST(auxHeatMixValve, "auxheatmix", "aux. heater mixing valve", "Mischer Zusatzheizer", "Bijverwarming menger", "Eltilskott Blandarventil", "mieszacz dogrzewacza", "", "Chauffage auxiliaire mélangeur") -MAKE_PSTR_LIST(hpHystHeat, "hphystheat", "on/off hyst heat", "Schalthysterese Heizen", "Aan/uit-hysteresis in verw. bedrijf", "På/av-hystereses Uppvärm.", "histereza wł./wył. ogrzewania", "På/av-hysterese Oppvar.", "Hystérésis Marche en mode chauffage") -MAKE_PSTR_LIST(hpHystCool, "hphystcool", "on/off hyst cool", "Schalthysterese Kühlen", "Aan/uit-hysteresis in koelbedrijf ", "På/av-hystereses Kyla", "histereza wł./wył. chłodzenia", "", "Hystérésis Marche en mode refroidissement") -MAKE_PSTR_LIST(hpHystPool, "hphystpool", "on/off hyst pool", "Schalthysterese Pool", "an/uit-hysteresis in zwembadbedri", "På/av-hystereses Pool", "histereza wł./wył. podgrzewania basenu", "", "Hystérésis Marche en mode piscine") +MAKE_PSTR_LIST(hpHystHeat, "hphystheat", "on/off hyst heat", "Schalthysterese Heizen", "Aan/uit-hysteresis in verw. bedrijf", "Hstereses Uppvärm.", "histereza wł./wył. ogrzewania", "På/av-hysterese Oppvar.", "Hystérésis Marche en mode chauffage") +MAKE_PSTR_LIST(hpHystCool, "hphystcool", "on/off hyst cool", "Schalthysterese Kühlen", "Aan/uit-hysteresis in koelbedrijf ", "Hystereses Kyla", "histereza wł./wył. chłodzenia", "", "Hystérésis Marche en mode refroidissement") +MAKE_PSTR_LIST(hpHystPool, "hphystpool", "on/off hyst pool", "Schalthysterese Pool", "an/uit-hysteresis in zwembadbedri", "Hystereses Pool", "histereza wł./wył. podgrzewania basenu", "", "Hystérésis Marche en mode piscine") MAKE_PSTR_LIST(tempDiffHeat, "tempdiffheat", "temp. diff. TC3/TC0 heat", "Temp.diff. TC3/TC0 Heizen", "Temp.vers. TC3/TC0 verw", "Delta(T) TC3/TC0 Uppvärm.", "różnica temperatur TC3/TC0 w trakcie ogrzewania", "", "Delta T TC3/TC0 Chauff") MAKE_PSTR_LIST(tempDiffCool, "tempdiffcool", "temp. diff. TC3/TC0 cool", "Temp.diff. TC3/TC0 Kühlen", "Temp.vers. TC3/TC0 koel.", "Delta(T) TC3/TC0 Kyla", "różnica temperatur TC3/TC0 w trakcie chłodzenia", "", "Delta T TC3/TC0 Refroid.") @@ -391,7 +390,7 @@ MAKE_PSTR_LIST(switchOverTemp, "switchovertemp", "outside switchover temperature MAKE_PSTR_LIST(energyCostRatio, "energycostratio", "energy cost ratio", "Energie/Kosten-Verhältnis", "Energiekostenratio", "Energi/Kostnads-förhållande", "współczynnik energia/koszt", "energi/kostnads forhold", "ratio coût énergie") MAKE_PSTR_LIST(fossileFactor, "fossilefactor", "fossile energy factor", "Energiefaktor Fossil", "Energiefactor fossiele brandstof", "Energifaktor fossilenergi", "udział energii z paliw kopalnych", "energifaktor fossilenergi", "facteur énergie fossile") MAKE_PSTR_LIST(electricFactor, "electricfactor", "electric energy factor", "Energiefaktor elektrisch", "Energiefactor electrisch", "Elektrisk energifaktor", "udział energii elektrycznej", "elektrisk energifaktor", "facteur énergie électrique") -MAKE_PSTR_LIST(delayBoiler, "delayboiler", "delay boiler support", "Verzögerungs-Option", "Vertragingsoptie", "Fördörjningsoption", "opcja opóźnienia", "Fördörjningsoption", "option retardement chaudière") +MAKE_PSTR_LIST(delayBoiler, "delayboiler", "delay boiler support", "Verzögerungs-Option", "Vertragingsoptie", "Fördröjningsoption", "opcja opóźnienia", "Fördörjningsoption", "option retardement chaudière") MAKE_PSTR_LIST(tempDiffBoiler, "tempdiffboiler", "temp diff boiler support", "Temperaturdifferenz-Option", "Verschiltemperatuuroptie", "Temperaturskillnadsoption", "opcja różnicy temperatur", "temperatursforskjell kjele", "option différence température") MAKE_PSTR_LIST(lowNoiseMode, "lownoisemode", "low noise mode", "Geräuscharmer Betrieb", "", "Tyst läge", "tryb cichy", "", "mode faible bruit") MAKE_PSTR_LIST(lowNoiseStart, "lownoisestart", "low noise starttime", "Start geräuscharmer Betrieb", "", "Tyst läge starttid", "początek trybu cichego", "", "heure démarrage faible bruit") @@ -455,15 +454,15 @@ MAKE_PSTR_LIST(wwChargeType, "wwchargetype", "charging type", "Speicher-Ladungst MAKE_PSTR_LIST(wwDisinfectionTemp, "wwdisinfectiontemp", "disinfection temperature", "Desinfektionstemperatur", "Desinfectietemperatuur", "Desinfektionstemperatur", "temperatura dezynfekcji termicznej", "", "température désinfection") MAKE_PSTR_LIST(wwCircMode, "wwcircmode", "circulation pump mode", "Zirkulationspumpen-Modus", "Modus circulatiepomp", "Läge Cirkulationspump", "tryb pracy cyrkulacji", "modus sikulasjonspumpe", "mode pompe circulation") MAKE_PSTR_LIST(wwCirc, "wwcirc", "circulation active", "Zirkulation aktiv", "Circulatiepomp actief", "Cirkulation aktiv", "pompa cyrkulacyjna", "sirkulasjon aktiv", "circulation active") -MAKE_PSTR_LIST(wwCurTemp, "wwcurtemp", "current intern temperature", "aktuelle interne Temperatur", "Huidige interne temperatuur", "Aktuell Intern Temperatur", "temperatura zasobnika", "gjeldende intern temperatur", "température interne actuelle") -MAKE_PSTR_LIST(wwCurTemp2, "wwcurtemp2", "current extern temperature", "aktuelle externe Temperatur", "Huidige externe temperatuur", "Aktuell Extern Temperatur", "temperatura wypływu", "gjeldende ekstern temperaur", "température externe actuelle") +MAKE_PSTR_LIST(wwCurTemp, "wwcurtemp", "current intern temperature", "aktuelle interne Temperatur", "Huidige interne temperatuur", "Intern Temperatur", "temperatura zasobnika", "gjeldende intern temperatur", "température interne actuelle") +MAKE_PSTR_LIST(wwCurTemp2, "wwcurtemp2", "current extern temperature", "aktuelle externe Temperatur", "Huidige externe temperatuur", "Extern Temperatur", "temperatura wypływu", "gjeldende ekstern temperaur", "température externe actuelle") MAKE_PSTR_LIST(wwCurFlow, "wwcurflow", "current tap water flow", "aktueller Durchfluss", "Hudige warmwater doorstroming", "Aktuellt tappvattenflöde", "aktualny przepływ", "gjeldende strømningshastighet", "débit actuel eau robinet") MAKE_PSTR_LIST(wwStorageTemp1, "wwstoragetemp1", "storage intern temperature", "interne Speichertemperatur", "Interne buffertemperatuur", "Beredare Intern Temperatur", "temperatura wewnątrz zasobnika", "intern temperatur bereder", "température interne stockage") MAKE_PSTR_LIST(wwStorageTemp2, "wwstoragetemp2", "storage extern temperature", "externer Speichertemperatur", "Externe buffertemperatuur", "Beredare Extern Tempereatur", "temperatura na wyjściu zasobnika", "ekstern temperatur bereder", "température externe stockage") MAKE_PSTR_LIST(wwActivated, "wwactivated", "activated", "aktiviert", "geactiveerd", "Aktiverad", "system przygotowywania c.w.u.", "aktivert", "activé") MAKE_PSTR_LIST(wwOneTime, "wwonetime", "one time charging", "Einmalladung", "Buffer eenmalig laden", "Engångsladdning", "jednorazowa dodatkowa ciepła woda", "", "charge unique") MAKE_PSTR_LIST(wwDisinfecting, "wwdisinfecting", "disinfecting", "Desinfizieren", "Desinfectie", "Desinficerar", "dezynfekcja termiczna", "desinfiserer", "désinfection") -MAKE_PSTR_LIST(wwCharging, "wwcharging", "charging", "Laden", "Laden", "Laddar", "grzanie", "varmer", "chargement") +MAKE_PSTR_LIST(wwCharging, "wwcharging", "charging", "Laden", "Laden", "Värmer", "grzanie", "varmer", "chargement") MAKE_PSTR_LIST(wwChargeOptimization, "wwchargeoptimization", "charge optimization", "Ladungsoptimierung", "laadoptimalisatie", "Laddningsoptimering", "optymalizacja grzania", "oppvarmingsoptimalisering", "optimisation charge") MAKE_PSTR_LIST(wwRecharging, "wwrecharging", "recharging", "Nachladen", "herladen", "Laddar om", "ponowne grzanie", "varm på nytt", "en recharge") MAKE_PSTR_LIST(wwTempOK, "wwtempok", "temperature ok", "Temperatur ok", "Temperatuur OK", "Temperatur OK", "temperatura OK", "temperatur ok!", "température ok") @@ -480,7 +479,7 @@ MAKE_PSTR_LIST(wwProgMode, "wwprogmode", "program", "Programmmodus", "Programma" MAKE_PSTR_LIST(wwCircProg, "wwcircprog", "circulation program", "Zirkulationsprogramm", "Circulatieprogramma", "Cirkulationsprogram", "program cyrkulacji c.w.u.", "sirkulationsprogram", "programme circulation") MAKE_PSTR_LIST(wwMaxTemp, "wwmaxtemp", "maximum temperature", "Maximale Temperatur", "Maximale temperatuur", "Maximal Temperatur", "temperatura maksymalna", "", "température max") MAKE_PSTR_LIST(wwOneTimeKey, "wwonetimekey", "one time key function", "Einmalladungstaste", "Knop voor eenmalig laden buffer", "Engångsfunktion", "przycisk jednorazowego ogrzania", "engangsknapp varme", "fonction touche unique") -MAKE_PSTR_LIST(wwSolarTemp, "wwsolartemp", "solar boiler temperature", "Solarboiler Temperatur", "Zonneboiler temperatuur", "", "temperatura zasobnika solarnego", "", "température chaudière solaire") +MAKE_PSTR_LIST(wwSolarTemp, "wwsolartemp", "solar boiler temperature", "Solarboiler Temperatur", "Zonneboiler temperatuur", "Solpanel Temp", "temperatura zasobnika solarnego", "", "température chaudière solaire") // mqtt values / commands @@ -558,7 +557,7 @@ MAKE_PSTR_LIST(targetflowtemp, "targetflowtemp", "target flow temperature", "ber MAKE_PSTR_LIST(heatingtype, "heatingtype", "heating type", "Heizungstyp", "Verwarmingstype", "Värmesystem", "system grzewczy", "varmesystem", "type chauffage") MAKE_PSTR_LIST(summersetmode, "summersetmode", "set summer mode", "Einstellung Sommerbetrieb", "Instelling zomerbedrijf", "Aktivera Sommarläge", "tryb lato/zima", "aktiver sommermodus", "activer mode été") MAKE_PSTR_LIST(hpoperatingmode, "hpoperatingmode", "heatpump operating mode", "Wärmepumpe Betriebsmodus", "Bedrijfsmodus warmtepomp", "Värmepump Driftläge", "tryb pracy pompy ciepła", "driftsmodus varmepumpe", "mode fonctionnement pompe à chaleur") -MAKE_PSTR_LIST(hpoperatingstate, "hpoperatingstate", "heatpump operating state", "WP Arbeitsweise", "Huidige modus warmtepomp", "Värmepump Driftstatus", "aktualny tryb pracy pompy ciepła", "driftstatus varmepumpe", "état fonctionnement pompe à chaleur") +MAKE_PSTR_LIST(hpoperatingstate, "hpoperatingstate", "heatpump operating state", "WP Arbeitsweise", "Huidige modus warmtepomp", "Värmepump driftläge", "aktualny tryb pracy pompy ciepła", "driftstatus varmepumpe", "état fonctionnement pompe à chaleur") MAKE_PSTR_LIST(controlmode, "controlmode", "control mode", "Kontrollmodus", "Comtrolemodus", "Kontrolläge", "tryb sterowania", "kontrollmodus", "mode régulation") MAKE_PSTR_LIST(control, "control", "control device", "Fernsteuerung", "Afstandsbedieding", "Kontrollenhet", "sterownik", "kontrollenhet", "dispositif régulation") MAKE_PSTR_LIST(roomsensor, "roomsensor", "room sensor", "Raumsensor", "Ruimtesensor", "Rumssensor", "czujnik temperatury pomieszczenia", "romsensor", "capteur pièce") @@ -718,4 +717,4 @@ MAKE_PSTR_LIST(setting3, "setting3", "unknown setting 3") MAKE_PSTR_LIST(setting4, "setting4", "unknown setting 4") */ -// clang-format on +// clang-format on \ No newline at end of file diff --git a/src/system.cpp b/src/system.cpp index 24342f4af..369d6e6bb 100644 --- a/src/system.cpp +++ b/src/system.cpp @@ -48,7 +48,7 @@ Adafruit_NeoPixel pixels(1, 7, NEO_GRB + NEO_KHZ800); namespace emsesp { // Languages supported. Note: the order is important and must match locale_translations.h -const char * const languages[] = {EMSESP_LOCALE_EN, EMSESP_LOCALE_DE, EMSESP_LOCALE_NL, EMSESP_LOCALE_SE, EMSESP_LOCALE_PL, EMSESP_LOCALE_NO, EMSESP_LOCALE_FR}; +const char * const languages[] = {EMSESP_LOCALE_EN, EMSESP_LOCALE_DE, EMSESP_LOCALE_NL, EMSESP_LOCALE_SV, EMSESP_LOCALE_PL, EMSESP_LOCALE_NO, EMSESP_LOCALE_FR}; size_t num_languages = sizeof(languages) / sizeof(const char *);