Merge pull request #626 from MichaelDvP/dev

Translations, move rf sensor #624

interface/src/components/layout/LayoutAuthMenu.tsx

@@ -89,7 +89,7 @@ const LayoutAuthMenu: FC = () => {
           <SEflag style={{ width: 16, verticalAlign: 'middle' }} />
           &nbsp;SE
         </MenuItem>
-        <MenuItem key="pl" value="pl" disabled>
+        <MenuItem key="pl" value="pl">
           <PLflag style={{ width: 16, verticalAlign: 'middle' }} />
           &nbsp;PL
         </MenuItem>

interface/src/i18n/no/index.ts

@@ -1,6 +1,6 @@
 import type { BaseTranslation } from '../i18n-types';
 
-const en: BaseTranslation = {
+const no: BaseTranslation = {
   LANGUAGE: 'Language',
   RETRY: 'Retry',
   LOADING: 'Loading',
@@ -262,4 +262,4 @@ const en: BaseTranslation = {
   RENAME: 'Rename'
 };
 
-export default en;
+export default no;

interface/src/i18n/pl/index.ts

@@ -1,265 +1,258 @@
 import type { BaseTranslation } from '../i18n-types';
 
-const en: BaseTranslation = {
+const pl: BaseTranslation = {
-  LANGUAGE: 'Language',
+  LANGUAGE: 'Język',
-  RETRY: 'Retry',
+  RETRY: 'Ponów',
-  LOADING: 'Loading',
+  LOADING: 'Ładowanie',
-  IS_REQUIRED: 'is required',
+  IS_REQUIRED: 'Czy wymagany?',
-  SIGN_IN: 'Sign In',
+  SIGN_IN: 'Zaloguj',
-  SIGN_OUT: 'Sign Out',
+  SIGN_OUT: 'Wyloguj',
-  USERNAME: 'Username',
+  USERNAME: 'Użytkownik',
-  PASSWORD: 'Password',
+  PASSWORD: 'Hasło',
-  DASHBOARD: 'Dashboard',
+  DASHBOARD: 'Pulpit',
-  SETTINGS: 'Settings',
+  SETTINGS: 'Ustawienia',
-  SAVED: 'saved',
+  SAVED: 'Zapisano',
-  HELP: 'Help',
+  HELP: 'Pomoc',
-  LOGGED_IN: 'Logged in as {name}',
+  LOGGED_IN: 'Zalogowany jako',
-  PLEASE_SIGNIN: 'Please sign in to continue',
+  PLEASE_SIGNIN: 'Zaloguj się aby kontynuować',
-  UPLOAD_SUCCESSFUL: 'Upload successful',
+  UPLOAD_SUCCESSFUL: 'Wgrywanie zakończone',
-  DOWNLOAD_SUCCESSFUL: 'Download successful',
+  DOWNLOAD_SUCCESSFUL: 'Ściąganie zakończone',
-  INVALID_LOGIN: 'Invalid login details',
+  INVALID_LOGIN: 'Niepoprawny login',
-  NETWORK: 'Network',
+  NETWORK: 'Śieć',
-  SECURITY: 'Security',
+  SECURITY: 'Bezpieczeństwo',
-  ONOFF_CAP: 'ON/OFF',
+  ONOFF_CAP: 'WŁ/WYŁ',
-  ONOFF: 'on/off',
+  ONOFF: 'wł/wył',
-  TYPE: 'Type',
+  TYPE: 'Urządzenie',
-  DESCRIPTION: 'Description',
+  DESCRIPTION: 'Opis',
-  ENTITIES: 'Entities',
+  ENTITIES: 'Ilość',
-  REFRESH: 'Refresh',
+  REFRESH: 'Odśwież',
-  EXPORT: 'Export',
+  EXPORT: 'Exportuj',
-  DEVICE_DETAILS: 'Device Details',
+  DEVICE_DETAILS: 'Szczegóły urządzenia',
-  BRAND: 'Brand',
+  BRAND: 'Marka',
-  ENTITY_NAME: 'Entity Name',
+  ENTITY_NAME: 'Nazwa',
-  VALUE: 'Value',
+  VALUE: 'Wartość',
-  SHOW_FAV: 'only show favorites',
+  SHOW_FAV: 'Ulubione',
-  DEVICE_SENSOR_DATA: 'Device and Sensor Data',
+  DEVICE_SENSOR_DATA: 'Dane z urządzeń i czujników',
-  DEVICES_SENSORS: 'Devices & Sensors',
+  DEVICES_SENSORS: 'Urządzenia i czujniki',
-  ATTACHED_SENSORS: 'Attached EMS-ESP Sensors',
+  ATTACHED_SENSORS: 'dołączone czujniki',
-  RUN_COMMAND: 'Call Command',
+  RUN_COMMAND: 'Uruchom komendę',
-  CHANGE_VALUE: 'Change Value',
+  CHANGE_VALUE: 'Zmień wartość',
-  CANCEL: 'Cancel',
+  CANCEL: 'Anuluj',
-  RESET: 'Reset',
+  RESET: 'Resetuj',
-  SEND: 'Send',
+  SEND: 'Wyślij',
-  SAVE: 'Save',
+  SAVE: 'Zapisz',
-  REMOVE: 'Remove',
+  REMOVE: 'Usuń',
-  PROBLEM_UPDATING: 'Problem updating',
+  PROBLEM_UPDATING: '',
-  PROBLEM_LOADING: 'Problem loading',
+  PROBLEM_LOADING: '',
-  ACCESS_DENIED: 'Access Denied',
+  ACCESS_DENIED: 'Brak dostępu',
-  ANALOG_SENSOR: 'Analog Sensor',
+  ANALOG_SENSOR: 'Czujnik analogowy',
-  ANALOG_SENSORS: 'Analog Sensors',
+  ANALOG_SENSORS: 'Czujniki analogowe',
-  UPDATED: 'Updated',
+  UPDATED: 'Zaktualizowano',
-  UPDATE: 'Update',
+  UPDATE: 'Aktualizacja',
-  REMOVED: 'Removed',
+  REMOVED: 'Usunięto',
-  DELETION: 'Deletion',
+  DELETION: 'Skasowano',
-  OFFSET: 'Offset',
+  // OFFSET: '',
-  FACTOR: 'Factor',
+  // FACTOR: '',
-  FREQ: 'Frequency',
+  FREQ: 'Częstotliwość',
-  STARTVALUE: 'Start value',
+  STARTVALUE: 'Wartość początkowa',
-  WARN_GPIO: 'Warning: be careful when assigning a GPIO!',
+  WARN_GPIO: 'Ostrzeżenie',
-  EDIT: 'Edit',
+  EDIT: 'Edycja',
-  TEMP_SENSOR: 'Temperature Sensor',
+  TEMP_SENSOR: 'Czujnik temperatury',
-  TEMP_SENSORS: 'Temperature Sensors',
+  TEMP_SENSORS: 'Czujniki temperatury',
-  WRITE_COMMAND: 'Write command {cmd}',
+  WRITE_COMMAND: 'Komenda zapisu',
-  EMS_BUS_WARNING:
+  EMS_BUS_WARNING: 'Magistrala EMS rozłączona. Jeśli ten błąd występuje dłużej niż kilka sekng, sprawdz ustawienia oraz profil urządzenia/płytki',
-    'EMS bus disconnected. If this warning still persists after a few seconds please check settings and board profile',
+  EMS_BUS_SCANNING: 'Skanuje w poszukiwaniu urządzeń EMS...',
-  EMS_BUS_SCANNING: 'Scanning for EMS devices...',
+  CONNECTED: 'Połączony',
-  CONNECTED: 'Connected',
+  TX_ISSUES: 'Problem Tx - spróbuj wybrać inny trym Tx',
-  TX_ISSUES: 'Tx issues - try a different Tx Mode',
+  DISCONNECTED: 'Rozłączony',
-  DISCONNECTED: 'Disconnected',
+  EMS_SCAN: 'Czy napewno chcesz uruchomić pełne skanowanie magistrali EMS?',
-  EMS_SCAN: 'Are you sure you want to initiate a full device scan of the EMS bus?',
+  EMS_BUS_STATUS: 'Status magistrali EMS',
-  EMS_BUS_STATUS: 'EMS Bus Status',
+  ACTIVE_DEVICES: 'Aktywne urządzenia i czujniki',
-  ACTIVE_DEVICES: 'Active Devices & Sensors',
+  DEVICE: 'Urządzenie',
-  DEVICE: 'Device',
+  SUCCESS: 'Powodzenie',
-  SUCCESS: 'SUCCESS',
+  FAIL: 'Niepowodzenie',
-  FAIL: 'FAIL',
+  QUALITY: 'Jakość',
-  QUALITY: 'QUALITY',
+  SCAN_DEVICES: 'Skanuj w poszukiwaniu nowych urządzeń',
-  SCAN_DEVICES: 'Scan for new devices',
+  EMS_BUS_STATUS_TITLE: 'Magistrala EMS - aktywności',
-  EMS_BUS_STATUS_TITLE: 'EMS Bus & Activity Status',
+  SCAN: 'Skanuj',
-  SCAN: 'Scan',
   STATUS_NAMES: [
-    'EMS Telegrams Received (Rx)',
+    'EMS Telegram Otrzymany (Rx)',
-    'EMS Reads (Tx)',
+    'EMS Odczyt (Tx)',
-    'EMS Writes (Tx)',
+    'EMS Zapis (Tx)',
-    'Temperature Sensor Reads',
+    'Odczyt czujników temperatury',
-    'Analog Sensor Reads',
+    'Odczyt czujników analogowych',
-    'MQTT Publishes',
+    'Publikacja MQTT',
-    'API Calls',
+    'Wywołania API',
-    'Syslog Messages'
+    'Wiadomości logu systemowego'
   ],
-  NUM_DEVICES: '{num} Device{{s}}',
+  NUM_DEVICES: '{num} Urządzeni{{a|e|a|a|a}}',
-  NUM_TEMP_SENSORS: '{num} Temperature Sensor{{s}}',
+  NUM_TEMP_SENSORS: '{num} Czujnik{{ki|k|ki|ki|ki}} temperatury',
-  NUM_ANALOG_SENSORS: '{num} Analog Sensor{{s}}',
+  NUM_ANALOG_SENSORS: '{num} Czujni{{ki|k|ki|ki|ki}} analogow{{e|y|e|e|e}}',
-  NUM_DAYS: '{num} Day{{s}}',
+  NUM_DAYS: '{num} {{Dni|Dzień|Dni|Dni|Dni}}',
-  NUM_SECONDS: '{num} Second{{s}}',
+  NUM_SECONDS: '{num} Sekun{{d|da|dy|dy|d}}',
-  NUM_HOURS: '{num} Hour{{s}}',
+  NUM_HOURS: '{num} Godzi{{n|na|ny|ny|n}}',
-  NUM_MINUTES: '{num} Minute{{s}}',
+  NUM_MINUTES: '{num} Minu{{t|ta|ty|ty|t}}',
-  APPLICATION_SETTINGS: 'Application Settings',
+  APPLICATION_SETTINGS: 'Ustawienia aplikacji',
-  CUSTOMIZATION: 'Customization',
+  CUSTOMIZATION: 'Personalizacja',
-  APPLICATION_RESTARTING: 'EMS-ESP is restarting',
+  APPLICATION_RESTARTING: 'Urządzenie się restartuje',
-  BOARD_PROFILE_TEXT:
+  BOARD_PROFILE_TEXT: 'Wybierz wstępną konfigurację interfejsu płytki z listy lub stwórz własną konfigurację urządzenia',
-    'Select a pre-configured interface board profile from the list below or choose Custom to configure your own hardware settings',
+  BOARD_PROFILE: 'Profil urządzenia',
-  BOARD_PROFILE: 'Board Profile',
+  BUTTON: 'Przycisk',
-  BUTTON: 'Button',
+  TEMPERATURE: 'Temperatura',
-  TEMPERATURE: 'Temperature',
+  DISABLED: 'wyłączony',
-  DISABLED: 'disabled',
+  GENERAL_OPTIONS: 'Opcje podstawowe',
-  GENERAL_OPTIONS: 'General Options',
+  LANGUAGE_ENTITIES: 'Język',
-  LANGUAGE_ENTITIES: 'Language (for device entities)',
+  HIDE_LED: 'Wyłącz diody LED',
-  HIDE_LED: 'Hide LED',
+  ENABLE_TELNET: 'Włącz dostęp dla konsoli Telnet',
-  ENABLE_TELNET: 'Enable Telnet Console',
+  ENABLE_ANALOG: 'Włącz czujniki analogowe',
-  ENABLE_ANALOG: 'Enable Analog Sensors',
+  CONVERT_FAHRENHEIT: "Konwertuj temperatury do Farenhaite'a",
-  CONVERT_FAHRENHEIT: 'Convert temperature values to Fahrenheit',
+  BYPASS_TOKEN: '',
-  BYPASS_TOKEN: 'Bypass Access Token authorization on API calls',
+  READONLY: 'Włącz tryb odczytu ',
-  READONLY: 'Enable read-only mode (blocks all outgoing EMS Tx Write commands)',
+  UNDERCLOCK_CPU: 'Zastosuj obniżone taktowanie CPU',
-  UNDERCLOCK_CPU: 'Underclock CPU speed',
+  // ENABLE_SHOWER_TIMER: '',
-  ENABLE_SHOWER_TIMER: 'Enable Shower Timer',
+  // ENABLE_SHOWER_ALERT: '',
-  ENABLE_SHOWER_ALERT: 'Enable Shower Alert',
+  // TRIGGER_TIME: '',
-  TRIGGER_TIME: 'Trigger Time',
+  // COLD_SHOT_DURATION: '',
-  COLD_SHOT_DURATION: 'Cold Shot Duration',
+  // FORMATTING_OPTIONS: '',
-  FORMATTING_OPTIONS: 'Formatting Options',
+  // BOOLEAN_FORMAT_DASHBOARD: '',
-  BOOLEAN_FORMAT_DASHBOARD: 'Boolean Format Dashboard',
+  // BOOLEAN_FORMAT_API: '',
-  BOOLEAN_FORMAT_API: 'Boolean Format API/MQTT',
+  // ENUM_FORMAT: '',
-  ENUM_FORMAT: 'Enum Format API/MQTT',
+  // INDEX: '',
-  INDEX: 'Index',
+  // ENABLE_PARASITE: '',
-  ENABLE_PARASITE: 'Enable parasite power',
+  LOGGING: 'Logowanie',
-  LOGGING: 'Logging',
+  LOG_HEX: 'Logowanie w systemie szesnastkowym (HEX)',
-  LOG_HEX: 'Log EMS telegrams in hexadecimal',
+  ENABLE_SYSLOG: 'Włącz log systemowy',
-  ENABLE_SYSLOG: 'Enable Syslog',
+  MARK_INTERVAL: 'Oznacz interwały',
-  MARK_INTERVAL: 'Mark Interval',
+  SECONDS: 'Sekundy',
-  SECONDS: 'seconds',
+  MINUTES: 'Minuty',
-  MINUTES: 'minutes',
+  HOURS: 'Restart',
-  RESTART: 'Restart',
+  RESTART: 'Godziny',
-  HOURS: 'hours',
+  RESTART_TEXT: 'Urządzenie musi zostać zrestartowane aby zastosować wprowadzone zmiany',
-  RESTART_TEXT: 'EMS-ESP needs to be restarted to apply changed system settings',
+  COMMAND: 'Komenda',
-  COMMAND: 'Command',
+  CUSTOMIZATIONS_RESTART: 'Wszystkie personalizacje zostały usunięte. Restartuję...',
-  CUSTOMIZATIONS_RESTART: 'All customizations have been removed. Restarting...',
+  CUSTOMIZATIONS_FULL: 'Wybrano za dużo obiektów. Wprowadź zmiany w mniejszych partiach',
-  CUSTOMIZATIONS_FULL: 'Selected entities exceeded limit. Please save in batches',
+  CUSTOMIZATIONS_SAVED: 'Personalizacje zapisane',
-  CUSTOMIZATIONS_SAVED: 'Customizations saved',
+  CUSTOMIZATIONS_HELP_1: 'Zaznacz urządzenie i wprowadź personalizację lub zmień nazwę',
-  CUSTOMIZATIONS_HELP_1: 'Select a device and customize the entities options or click to rename',
+  CUSTOMIZATIONS_HELP_2: 'Oznacz jako ulubione',
-  CUSTOMIZATIONS_HELP_2: 'mark as favorite',
+  CUSTOMIZATIONS_HELP_3: '',
-  CUSTOMIZATIONS_HELP_3: 'disable write action',
+  CUSTOMIZATIONS_HELP_4: '',
-  CUSTOMIZATIONS_HELP_4: 'exclude from MQTT and API',
+  CUSTOMIZATIONS_HELP_5: 'ukryj na pulpicie',
-  CUSTOMIZATIONS_HELP_5: 'hide from Dashboard',
+  SELECT_DEVICE: 'Wybierz urządzenie',
-  SELECT_DEVICE: 'Select a device',
+  SET_ALL: 'Zaznacz wszystko',
-  SET_ALL: 'set all',
+  OPTIONS: 'Opcje',
-  OPTIONS: 'Options',
+  NAME: 'Nazwa',
-  NAME: 'Name',
+  CUSTOMIZATIONS_RESET: 'Czy jesteś pewien, że chcesz usunąć wszystkie personalizacje łącznie z ustawieniami dla czujników temperatury i analogowych?',
-  CUSTOMIZATIONS_RESET:
+  // DEVICE_ENTITIES: '',
-    'Are you sure you want remove all customizations including the custom settings of the Temperature and Analog sensors?',
+  // USER_CUSTOMIZATION: '',
-  DEVICE_ENTITIES: 'Device Entities',
+  SUPPORT_INFORMATION: 'Dodatkowe informacje',
-  USER_CUSTOMIZATION: 'User Customization',
+  CLICK_HERE: 'Kliknij tu',
-  SUPPORT_INFORMATION: 'Support Information',
+  HELP_INFORMATION_1: 'Skorzystaj z wiki w celu znalezienia szczegółowych instrukcji jak skonfigurowac EMS-ESP',
-  CLICK_HERE: 'Click Here',
+  HELP_INFORMATION_2: 'Skorzystaj z serwera Discord w celu komunikacji na żywo ze społecznością',
-  HELP_INFORMATION_1: 'Visit the online wiki to get instructions on how to configure EMS-ESP',
+  HELP_INFORMATION_3: 'Aby zaproponować nową funkcjonalność, lub zgłosić problem',
-  HELP_INFORMATION_2: 'For live community chat join our Discord server',
+  HELP_INFORMATION_4: 'gdy zgłaszasz problem, będzie on szybciej zadresowany gdy do zgłoszenia dołączysz pełną informację systemową',
-  HELP_INFORMATION_3: 'To request a feature or report a bug',
+  HELP_INFORMATION_5: 'EMS-ESP jest darmowym projektem typu open-source. Aby go wesprzeć, rozważ przyznanie nam gwiazdki na Github!',
-  HELP_INFORMATION_4: 'remember to download and attach your system information for a faster response when reporting an issue',
+  SUPPORT_INFO: 'Dodatkowe info',
-  HELP_INFORMATION_5:
+  UPLOAD: 'Wgraj',
-    "EMS-ESP is a free and open-source project. Please support its future development by giving it a star on Github!",
+  DOWNLOAD: 'Ściągnij',
-  SUPPORT_INFO: 'Support Info',
+  ABORTED: 'przerwano',
-  UPLOAD: 'Upload',
+  FAILED: 'zakończono niepowodzeniem',
-  DOWNLOAD: 'Download',
+  SUCCESSFUL: 'sukces',
-  ABORTED: 'aborted',
-  FAILED: 'failed',
-  SUCCESSFUL: 'successful',
   SYSTEM: 'System',
   LOG: 'Log',
   STATUS: 'Status',
-  UPLOAD_DOWNLOAD: 'Upload/Download',
+  UPLOAD_DOWNLOAD: 'Wgraj/Zapisz',
-  SYSTEM_VERSION_RUNNING: 'You are currently running version',
+  SYSTEM_VERSION_RUNNING: 'Twoja obecna wersja oprogramowania to:',
-  SYSTEM_APPLY_FIRMWARE: 'to apply the new firmware',
+  SYSTEM_APPLY_FIRMWARE: 'do wgrania nowego oprogramowania wbudowanego',
-  CLOSE: 'Close',
+  CLOSE: 'Zamknij',
-  USE: 'Use',
+  USE: 'Skorzystaj z',
-  FACTORY_RESET: 'Factory Reset',
+  FACTORY_RESET: 'Ustawienia fabryczne',
-  SYSTEM_FACTORY_TEXT: 'Device has been factory reset and will now restart',
+  SYSTEM_FACTORY_TEXT: 'Urządzenie zostało przywrócone do ustawień fabrycznych i zostanie teraz zrestartowane',
-  SYSTEM_FACTORY_TEXT_DIALOG: 'Are you sure you want to reset the device to its factory defaults?',
+  SYSTEM_FACTORY_TEXT_DIALOG: 'Czy jesteś pewien, że chcesz zresetować urządzenie do ustawień fabrycznych? ',
-  VERSION_CHECK: 'Version Check',
+  VERSION_CHECK: 'Sprawdź wersję oprogramowania wbudowanego',
-  THE_LATEST: 'The latest',
+  THE_LATEST: 'Ostatnia',
-  PLATFORM: 'Device (Platform / SDK)',
+  PLATFORM: 'Urządzenie (Platforma/SDK)',
-  UPTIME: 'System Uptime',
+  UPTIME: 'Czas działania systemu',
-  CPU_FREQ: 'CPU Frequency',
+  CPU_FREQ: 'Taktowanie procesora (CPU)',
-  HEAP: 'Heap (Free / Max Alloc)',
+  HEAP: 'Pamięć (Wolna / Zaalokowana)',
-  PSRAM: 'PSRAM (Size / Free)',
+  PSRAM: 'PSRAM (Rozmiar / Wolna)',
-  FLASH: 'Flash Chip (Size / Speed)',
+  FLASH: 'Pamięć flash ( Rozmiar / Taktowanie)',
-  FILESYSTEM: 'File System (Used / Total)',
+  FILESYSTEM: 'System plików (Wykorzystano / Cała pojemność)',
-  BUFFER_SIZE: 'Buffer Size',
+  BUFFER_SIZE: 'Rozmiar bufora',
-  COMPACT: 'Compact',
+  COMPACT: 'Kompaktowy',
-  ENABLE_OTA: 'Enable OTA Updates',
+  ENABLE_OTA: 'Włącz aktualizację OTA',
-  DOWNLOAD_CUSTOMIZATION_TEXT: 'Download the entity customizations',
+  DOWNLOAD_CUSTOMIZATION_TEXT: 'Ściągnij personalizacje',
-  DOWNLOAD_SETTINGS_TEXT:
+  DOWNLOAD_SETTINGS_TEXT: 'Ściągnij ustawienia aplikacji. Uważaj jeśli udostępniasz plik z ustawieniami, ponieważ zawiera on hasła oraz inne wrażliwe informacjie',
-    'Download the application settings. Be careful when sharing your settings as this file contains passwords and other sensitive system information',
+  UPLOAD_TEXT: 'Wgraj nowe oprogramowanie układowe - firmware (.bin), ustawienia lub personalizacje (.json)',
-  UPLOAD_TEXT: 'Upload a new firmware (.bin) file, settings or customizations (.json) file below',
+  UPLOADING: 'wgrywanie',
-  UPLOADING: 'Uploading',
+  UPLOAD_DROP_TEXT: 'Przeciągnij plik lub kliknij',
-  UPLOAD_DROP_TEXT: 'Drop file or click here',
+  ERROR: 'Nieoczekiwany błąd, spróbuj ponownie',
-  ERROR: 'Unexpected Error, please try again',
+  TIME_SET: 'Ustaw czas',
-  TIME_SET: 'Time set',
+  MANAGE_USERS: 'Zarządzanie użytkownikami',
-  MANAGE_USERS: 'Manage Users',
+  IS_ADMIN: 'Admin?',
-  IS_ADMIN: 'is Admin',
+  USER_WARNING: 'Przynajmniej jeden użytkownik musi mieć uprawnienia admina',
-  USER_WARNING: 'You must have at least one admin user configured',
+  ADD: 'Dodaj',
-  ADD: 'Add',
+  ACCESS_TOKEN_FOR: 'Token dostępowy dla',
-  ACCESS_TOKEN_FOR: 'Access Token for',
+  ACCESS_TOKEN_TEXT: 'Token jest używany do korzystania z wywołań REST API, wymagających autoryzacji. Można go przekazać bezpośrednio lub przez URL',
-  ACCESS_TOKEN_TEXT:
+  GENERATING_TOKEN: 'Genrowanie tokenu',
-    'The token below is used with REST API calls that require authorization. It can be passed either as a Bearer token in the Authorization header or in the access_token URL query parameter.',
+  USER: 'Użytkownik',
-  GENERATING_TOKEN: 'Generating token',
+  MODIFY: 'Modyfikuj',
-  USER: 'User',
+  SU_TEXT: 'Hasło Super Użytkownika jest wykorzystywane do autoryzacji tokenów oraz dostępu do konsoli z uprawnieniami admina',
-  MODIFY: 'Modify',
+  NOT_ENABLED: 'wyłączony',
-  SU_TEXT:
+  ERRORS: 'Błędy',
-    'The su (super user) password is used to sign authentication tokens and also enable admin privileges within the Console.',
+  DISCONNECT_REASON: 'Powody rozłączenia',
-  NOT_ENABLED: 'Not enabled',
+  ENABLE_MQTT: 'Włącz MQTT',
-  ERRORS: 'Errors',
+  OPTIONAL: 'opcjonalny',
-  DISCONNECT_REASON: 'Disconnect Reason',
+  FORMATTING: 'Formatuj przesyłane dane',
-  ENABLE_MQTT: 'Enable MQTT',
-  OPTIONAL: 'Optional',
-  FORMATTING: 'Formatting',
   FORMAT: 'Format',
-  MQTT_NEST_1: 'Nested in a single topic',
+  MQTT_NEST_1: 'Zagnieżdzone w pojedyńczym temacie',
-  MQTT_NEST_2: 'As individual topics',
+  MQTT_NEST_2: 'Jako indywidualne tematy',
-  MQTT_RESPONSE: 'Publish command output to a `response` topic',
+  MQTT_RESPONSE: 'Publikuj wyjścia jako tematy odpowiedzi',
-  MQTT_PUBLISH_TEXT_1: 'Publish single value topics on change',
+  MQTT_PUBLISH_TEXT_1: 'Publiku pojedyńcze wartości w temacie po zmianie',
-  MQTT_PUBLISH_TEXT_2: 'Publish to command topics (ioBroker)',
+  MQTT_PUBLISH_TEXT_2: 'Publikuj tematy (ioBroker)',
-  MQTT_PUBLISH_TEXT_3: 'Enable MQTT Discovery (Home Assistant, Domoticz)',
+  MQTT_PUBLISH_TEXT_3: 'Włącz opcję MQTT Discovery (Home Assistant, Domoticz)',
-  MQTT_PUBLISH_TEXT_4: 'Prefix for the Discovery topics',
+  MQTT_PUBLISH_TEXT_4: 'Przedrostek do tematów "Discovery"',
-  MQTT_PUBLISH_INTERVALS: 'Publish Intervals',
+  MQTT_PUBLISH_INTERVALS: 'Czas pomiędzy publikacjami',
-  MQTT_INT_BOILER: 'Boilers and Heat Pumps',
+  MQTT_INT_BOILER: 'Kotły i pompy ciepła',
-  MQTT_INT_THERMOSTATS: 'Thermostats',
+  MQTT_INT_THERMOSTATS: 'Termostaty',
-  MQTT_INT_SOLAR: 'Solar Modules',
+  MQTT_INT_SOLAR: 'Panele solarne',
-  MQTT_INT_MIXER: 'Mixer Modules',
+  MQTT_INT_MIXER: 'Mieszacze',
-  DEFAULT: 'Default',
+  DEFAULT: 'Domyślnie',
-  MQTT_CLEAN_SESSION: 'Set Clean Session',
+  MQTT_CLEAN_SESSION: 'Clean session',
-  MQTT_RETAIN_FLAG: 'Always set Retain flag',
+  MQTT_RETAIN_FLAG: 'Retain flag',
-  INACTIVE: 'Inactive',
+  INACTIVE: 'nieaktywny',
-  ACTIVE: 'Active',
+  ACTIVE: 'aktywny',
-  UNKNOWN: 'Unknown',
+  UNKNOWN: 'nieznany',
-  SET_TIME: 'Set Time',
+  SET_TIME: 'Ustawienia data/czas',
-  SET_TIME_TEXT: 'Enter local date and time below to set the time',
+  SET_TIME_TEXT: 'Wprowadź aktualną datę i czas',
-  LOCAL_TIME: 'Local Time',
+  LOCAL_TIME: 'czas lokalny',
-  UTC_TIME: 'UTC Time',
+  UTC_TIME: 'czas UTC',
-  ENABLE_NTP: 'Enable NTP',
+  ENABLE_NTP: 'Włącz NTP',
-  TIME_ZONE: 'Time Zone',
+  TIME_ZONE: 'Strefa czasowa',
-  ACCESS_POINT: 'Access Point',
+  ACCESS_POINT: 'Punkt Dostępowy',
-  AP_PROVIDE: 'Enable Access Point',
+  AP_PROVIDE: 'Włącz tryb pracy jako punkt dostępowy (AP)',
-  AP_PROVIDE_TEXT_1: 'always',
+  AP_PROVIDE_TEXT_1: 'zawsze',
-  AP_PROVIDE_TEXT_2: 'when WiFi is disconnected',
+  AP_PROVIDE_TEXT_2: 'gdy połączenie WiFi jest rozłączone',
-  AP_PROVIDE_TEXT_3: 'never',
+  AP_PROVIDE_TEXT_3: 'nigdy',
-  AP_PREFERRED_CHANNEL: 'Preferred Channel',
+  AP_PREFERRED_CHANNEL: 'Preferowany kanał',
-  AP_HIDE_SSID: 'Hide SSID',
+  AP_HIDE_SSID: 'Ukryj SSID',
-  NETWORK_SCAN: 'Scan WiFi Networks',
+  NETWORK_SCAN: 'Skanuj sieci WiFi',
-  IDLE: 'Idle',
+  IDLE: 'uśpiony',
-  LOST: 'Lost',
+  LOST: 'utracony',
-  SCANNING: 'Scanning',
+  SCANNING: 'Skanuję',
-  SCAN_AGAIN: 'Scan again',
+  SCAN_AGAIN: 'Skanuj ponownie',
-  NETWORK_SCANNER: 'Network Scanner',
+  NETWORK_SCANNER: 'Skaner sieci WiFi',
-  NETWORK_NO_WIFI: 'No WiFi networks found',
+  NETWORK_NO_WIFI: 'Brak sieci WiFi w zasięgu',
-  NETWORK_BLANK_SSID: 'leave blank to disable WiFi',
+  NETWORK_BLANK_SSID: 'Zostaw puste aby wyłączyć WiFi',
-  POWER: 'Power',
+  POWER: 'Zasilanie',
-  NETWORK_DISABLE_SLEEP: 'Disable WiFi Sleep Mode',
+  NETWORK_DISABLE_SLEEP: 'Wyłącz tryb uśpienia WiFi',
-  NETWORK_LOW_BAND: 'Use Lower WiFi Bandwidth',
+  // NETWORK_LOW_BAND: '',
-  NETWORK_USE_DNS: 'Enable mDNS Service',
+  NETWORK_USE_DNS: 'Włącz wsparcie dla mDNS',
-  NETWORK_ENABLE_IPV6: 'Enable IPv6 support',
+  NETWORK_ENABLE_IPV6: 'Włącz wsparcie dla IPv6',
-  NETWORK_FIXED_IP: 'Use Fixed IP address',
+  NETWORK_FIXED_IP: 'Korzystaj ze stałego adresu IP',
   ADMIN: 'Admin',
-  GUEST: 'Guest',
+  GUEST: 'Gość',
-  NEW: 'New',
+  NEW: 'Nowy',
-  RENAME: 'Rename'
+  RENAME: 'Zmień nazwę'
 };
 
-export default en;
+export default pl;

src/devices/generic.cpp

@@ -26,21 +26,6 @@ uuid::log::Logger Generic::logger_{F_(generic), uuid::log::Facility::CONSOLE};
 
 Generic::Generic(uint8_t device_type, uint8_t device_id, uint8_t product_id, const char * version, const std::string & name, uint8_t flags, uint8_t brand)
     : EMSdevice(device_type, device_id, product_id, version, name, flags, brand) {
-    // RF-Sensor 0x40 sending temperature in telegram 0x435, see https://github.com/emsesp/EMS-ESP32/issues/103
-    if (device_id == 0x40) {
-        register_telegram_type(0x435, F("RFSensorMessage"), false, MAKE_PF_CB(process_RFSensorMessage));
-        register_device_value(DeviceValueTAG::TAG_DEVICE_DATA,
-                              &rfTemp_,
-                              DeviceValueType::SHORT,
-                              DeviceValueNumOp::DV_NUMOP_DIV10,
-                              FL_(RFTemp),
-                              DeviceValueUOM::DEGREES);
-    }
-}
-
-// type 0x435 rf remote sensor
-void Generic::process_RFSensorMessage(std::shared_ptr<const Telegram> telegram) {
-    has_update(telegram, rfTemp_, 0); // is * 10
 }
 
 } // namespace emsesp

src/devices/generic.h

@@ -29,10 +29,6 @@ class Generic : public EMSdevice {
 
   private:
     static uuid::log::Logger logger_;
-
-    int16_t rfTemp_;
-
-    void process_RFSensorMessage(std::shared_ptr<const Telegram> telegram);
 };
 
 } // namespace emsesp

src/devices/thermostat.cpp

@@ -28,8 +28,13 @@ Thermostat::Thermostat(uint8_t device_type, uint8_t device_id, uint8_t product_i
     : EMSdevice(device_type, device_id, product_id, version, name, flags, brand) {
     uint8_t model = this->model();
 
-    // remote thermostats with humidity
+    // RF remote sensor seen at 0x40, maybe this is also for different hc with id 0x40 - 0x47? emsesp.cpp maps only 0x40
-    if (device_id >= 0x38 && device_id <= 0x3F) { // RC100H remote
+    if (device_id >= 0x40 && device_id <= 0x47) {
+        register_telegram_type(0x0435, F("RFTemp"), false, MAKE_PF_CB(process_RemoteTemp));
+        return;
+    }
+    // remote thermostats with humidity: RC100H remote
+    if (device_id >= 0x38 && device_id <= 0x3F) {
         register_telegram_type(0x042B, F("RemoteTemp"), false, MAKE_PF_CB(process_RemoteTemp));
         register_telegram_type(0x047B, F("RemoteHumidity"), false, MAKE_PF_CB(process_RemoteHumidity));
         register_telegram_type(0x0273, F("RemoteCorrection"), true, MAKE_PF_CB(process_RemoteCorrection));
@@ -170,6 +175,7 @@ Thermostat::Thermostat(uint8_t device_type, uint8_t device_id, uint8_t product_i
         register_telegram_type(0xBB, F("HybridSettings"), true, MAKE_PF_CB(process_JunkersHybridSettings));
         register_telegram_type(0x23, F("JunkersSetMixer"), true, MAKE_PF_CB(process_JunkersSetMixer));
         register_telegram_type(0x123, F("JunkersRemote"), false, MAKE_PF_CB(process_JunkersRemoteMonitor));
+        register_telegram_type(0x1D3, F("JunkersDhw"), true, MAKE_PF_CB(process_JunkersWW));
     }
 
     // register device values for common values (not heating circuit)
@@ -890,6 +896,9 @@ void Thermostat::process_JunkersSetMixer(std::shared_ptr<const Telegram> telegra
     has_update(telegram, hc->targetflowtemp, 0);
 }
 
+void Thermostat::process_JunkersWW(std::shared_ptr<const Telegram> telegram) {
+    has_bitupdate(telegram, wwCharge_, 0, 3);
+}
 
 // type 0x02A5 - data from Worchester CRF200
 void Thermostat::process_CRFMonitor(std::shared_ptr<const Telegram> telegram) {
@@ -1765,7 +1774,11 @@ bool Thermostat::set_wwcharge(const char * value, const int8_t id) {
         return false;
     }
 
-    write_command(0x02F5, 11, b ? 0xFF : 0x00, 0x02F5);
+    if ((model() == EMS_DEVICE_FLAG_JUNKERS)) {
+        write_command(0x0115, 0, b ? 0xFF : 0x00, 0x01D3);
+    } else {
+        write_command(0x02F5, 11, b ? 0xFF : 0x00, 0x02F5);
+    }
 
     return true;
 }
@@ -2602,7 +2615,16 @@ bool Thermostat::set_switchtime(const char * value, const uint16_t type_id, char
             if (strlen(s_time) == 5 && s_time[2] == ':') {
                 time = 6 * ((s_time[0] - '0') * 10 + (s_time[1] - '0')) + (s_time[3] - '0');
             }
-        } else {
+        } else if ((model() == EMS_DEVICE_FLAG_RC20) || (model() == EMS_DEVICE_FLAG_RC30)) {
+            if (s_mode[0] == 'T') {
+                on = s_mode[1] - '0';
+            } else {
+                on = s_mode[0] - '0';
+            }
+            if (strlen(s_time) == 5 && s_time[2] == ':') {
+                time = 6 * ((s_time[0] - '0') * 10 + (s_time[1] - '0')) + (s_time[3] - '0');
+            }
+        } else { // RC300
             Helpers::value2enum(s_mode, on, FL_(enum_switchmode));
             if (strlen(s_time) == 5 && s_time[2] == ':') {
                 time = 4 * ((s_time[0] - '0') * 10 + (s_time[1] - '0')) + ((s_time[3] - '0') * 10 + (s_time[4] - '0')) / 15;
@@ -2676,7 +2698,7 @@ bool Thermostat::set_switchtime(const char * value, const uint16_t type_id, char
     if (data[0] != 0xE7) {
         // we use EN settings for the day abbreviation
         std::string sday = read_flash_string(FL_(enum_dayOfWeek)[day][0]);
-        // s td::string sday = Helpers::translated_word(FL_(enum_dayOfWeek)[day]);
+        // std::string sday = Helpers::translated_word(FL_(enum_dayOfWeek)[day]);
         if (model() == EMS_DEVICE_FLAG_RC35 || model() == EMS_DEVICE_FLAG_RC30_N) {
             snprintf(out, len, "%02d %s %02d:%02d %s", no, sday.c_str(), time / 6, 10 * (time % 6), on ? "on" : "off");
         } else if ((model() == EMS_DEVICE_FLAG_RC20) || (model() == EMS_DEVICE_FLAG_RC30)) {
@@ -3304,6 +3326,12 @@ bool Thermostat::set_remoteseltemp(const char * value, const int8_t id) {
 // register main device values, top level for all thermostats (excluding heating circuits)
 // as these are done in void Thermostat::register_device_values_hc()
 void Thermostat::register_device_values() {
+    // RF remote sensor seen at 0x40, maybe this is also for different hc with id 0x40 - 0x47? emsesp.cpp maps only 0x40
+    if (device_id() >= 0x40 && device_id() <= 0x47) {
+        uint8_t tag = DeviceValueTAG::TAG_HC1 + device_id() - 0x40;
+        register_device_value(tag, &tempsensor1_, DeviceValueType::SHORT, DeviceValueNumOp::DV_NUMOP_DIV10, FL_(RFTemp), DeviceValueUOM::DEGREES);
+        return;
+    }
     // RC100H remote with humidity, this is also EMS_DEVICE_FLAG_RC100 for set_calinttemp
     if (device_id() >= 0x38 && device_id() <= 0x3F) {
         // each device controls only one hc, so we tag the values
@@ -3865,6 +3893,7 @@ void Thermostat::register_device_values() {
                               MAKE_CF_CB(set_tempDiffBoiler),
                               1,
                               99);
+        register_device_value(DeviceValueTAG::TAG_DEVICE_DATA_WW, &wwCharge_, DeviceValueType::BOOL, FL_(wwCharge), DeviceValueUOM::NONE, MAKE_CF_CB(set_wwcharge));
         break;
     case EMS_DEVICE_FLAG_EASY:
         // Easy TC100 have no date/time, see issue #100, not sure about CT200, so leave it.

src/devices/thermostat.h

@@ -379,6 +379,7 @@ class Thermostat : public EMSdevice {
     void process_JunkersRemoteMonitor(std::shared_ptr<const Telegram> telegram);
     void process_JunkersHybridSettings(std::shared_ptr<const Telegram> telegram);
     void process_JunkersSetMixer(std::shared_ptr<const Telegram> telegram);
+    void process_JunkersWW(std::shared_ptr<const Telegram> telegram);
     void process_RemoteTemp(std::shared_ptr<const Telegram> telegram);
     void process_RemoteHumidity(std::shared_ptr<const Telegram> telegram);
     void process_RemoteCorrection(std::shared_ptr<const Telegram> telegram);

src/emsesp.cpp

@@ -991,8 +991,9 @@ bool EMSESP::add_device(const uint8_t device_id, const uint8_t product_id, const
     if (product_id == 0) {
         // check for known device IDs
         if (device_id == 0x40) {
-            // see: https://github.com/emsesp/EMS-ESP32/issues/103#issuecomment-911717342
+            // see: https://github.com/emsesp/EMS-ESP32/issues/103#issuecomment-911717342 and https://github.com/emsesp/EMS-ESP32/issues/624
-            name = "rf room temperature sensor"; // generic
+            name        = "rf room temperature sensor";
+            device_type = DeviceType::THERMOSTAT;
         } else if (device_id == 0x17) {
             name        = "generic thermostat";
             device_type = DeviceType::THERMOSTAT;

src/locale_translations.h

@@ -42,6 +42,7 @@ MAKE_PSTR_LIST(hours, F("hours"), F("Stunden"), F("Uren"), F("Timmar"))
 MAKE_PSTR_LIST(days, F("days"), F("Tage"), F("Dagen"), F("Dagar"))
 MAKE_PSTR_LIST(seconds, F("seconds"), F("Sekunden"), F("Seconden"), F("Sekunder"))
 
+// Enum translations
 // general
 MAKE_PSTR_LIST(day_mo, F("mo"), F("Mo"), F("Mo"), F("Må"))
 MAKE_PSTR_LIST(day_tu, F("tu"), F("Di"), F("Di"), F("Ti"))
@@ -65,7 +66,7 @@ MAKE_PSTR_LIST(pm, F("pm"), F("Nachmittag"), F("Namiddag"), F("Eftermiddag"))
 MAKE_PSTR_LIST(midday, F("midday"), F("Mittag"), F("Middag"), F("Middag"))
 MAKE_PSTR_LIST(unknown, F("unknown"), F("Unbekannt"), F("Onbekend"), F("Okänt"))
 MAKE_PSTR_LIST(flat, F("flat"), F("flach"), F("vlak"), F("Platt"))
-MAKE_PSTR_LIST(vacuum, F("vacuum"), F("vakuum"), F("vacuum"), F("Vakuum"))
+MAKE_PSTR_LIST(vacuum, F("vacuum"), F("Vakuum"), F("vacuum"), F("Vakuum"))
 MAKE_PSTR_LIST(co2_optimized, F("co2 optimized"), F("CO2 optimiert"), F("CO2 geoptimaliseerd"), F("CO2-optimerad"))
 MAKE_PSTR_LIST(cost_optimized, F("cost optimized"), F("kostenoptimiert"), F("kosten geoptimaliseerd"), F("kostnadsoptimerad"))
 MAKE_PSTR_LIST(outside_temp_switched, F("outside temp switched"), F("Außentemp. gesteuert"), F("Buitentemp. gestuurd"), F("Utomhustemp korrigerad"))
@@ -92,14 +93,14 @@ MAKE_PSTR_LIST(layeredbuffer, F("layered buffer"), F("Schichtspeicher"), F("Gela
 MAKE_PSTR_LIST(maintenance, F("maintenance"), F("Wartung"), F("Onderhoud"), F("Underhåll"))
 MAKE_PSTR_LIST(heating, F("heating"), F("Heizen"), F("Verwarmen"), F("Uppvärmning"))
 MAKE_PSTR_LIST(cooling, F("cooling"), F("Kühlen"), F("Koelen"), F("Kyler"))
-MAKE_PSTR_LIST(disinfecting, F("disinfecting"), F("desinfizieren"), F("Desinfecteren"), F("Desinficerar"))
+MAKE_PSTR_LIST(disinfecting, F("disinfecting"), F("Desinfizieren"), F("Desinfecteren"), F("Desinficerar"))
 MAKE_PSTR_LIST(no_heat, F("no heat"), F("keine Wärme"), F("Geen warmte"), F("Ingen värme"))
 MAKE_PSTR_LIST(heatrequest, F("heat request"), F("Wärmeanforderung"), F("Verwarmignsverzoek"), F("Värmeförfrågan"))
 MAKE_PSTR_LIST(valve, F("valve"), F("Ventil"), F("Klep"), F("Ventil"))
 
 // heatpump
-MAKE_PSTR_LIST(none, F("none"), F("keiner"), F("geen"), F("ingen"))
+MAKE_PSTR_LIST(none, F("none"), F("keine"), F("geen"), F("ingen"))
-MAKE_PSTR_LIST(hot_water, F("hot water"), F("heißes Wasser"), F("warm water"), F("varmvatten"))
+MAKE_PSTR_LIST(hot_water, F("hot water"), F("Warmwasser"), F("warm water"), F("varmvatten"))
 MAKE_PSTR_LIST(pool, F("pool"), F("Pool"), F("zwembad"), F("pool"))
 
 // thermostat
@@ -153,19 +154,24 @@ MAKE_PSTR_LIST(burner_temperature, F("burner temperature"), F("Brennertemperatur
 MAKE_PSTR_LIST(ww_temperature, F("ww temperature"), F("Wassertemperatur"), F("Watertemperatuur"), F("Vattentemperatur"))
 MAKE_PSTR_LIST(smoke_temperature, F("smoke temperature"), F("Abgastemperatur"), F("Buitentemperatuur"), F("Rökgastemperatur"))
 MAKE_PSTR_LIST(weather_compensated, F("weather compensated"), F("Wetter kompensiert"), F("Weer gecompenseerd"), F("Väderkompenserad"))
-MAKE_PSTR_LIST(outside_basepoint, F("outside basepoint"), F("außerhalb des Basispunktes"), F("Buiten basispunt"), F("Utomhus baspunkt"))
+MAKE_PSTR_LIST(outside_basepoint, F("outside basepoint"), F("Basispunkt Außentemp."), F("Buiten basispunt"), F("Utomhus baspunkt"))
 MAKE_PSTR_LIST(functioning_mode, F("functioning mode"), F("Funktionsweise"), F("Functiemodus"), F("Driftläge"))
 
 // mixer
 MAKE_PSTR_LIST(stopped, F("stopped"), F("gestoppt"), F("gestopt"), F("stoppad"))
 MAKE_PSTR_LIST(opening, F("opening"), F("öffnen"), F("openen"), F("öppnar"))
 MAKE_PSTR_LIST(closing, F("closing"), F("schließen"), F("sluiten"), F("stänger"))
-MAKE_PSTR_LIST(open, F("open"), F("Offen"), F("Open"), F("Öppen"))
+MAKE_PSTR_LIST(open, F("open"), F("offen"), F("Open"), F("Öppen"))
-MAKE_PSTR_LIST(close, F("close"), F("Geschlossen"), F("Gesloten"), F("Stängd"))
+MAKE_PSTR_LIST(close, F("close"), F("geschlossen"), F("Gesloten"), F("Stängd"))
 
+// solar ww
+MAKE_PSTR_LIST(cyl1, F("cyl 1"), F("Zyl_1"), F("Cil 1"), F("Cyl 1"))
+MAKE_PSTR_LIST(cyl2, F("cyl 2"), F("Zyl_2"), F("Cil 2"), F("Cyl 2"))
+
+// Entity translations
 // Boiler
-MAKE_PSTR_LIST(wwtapactivated, F("wwtapactivated"), F("turn on/off"), F("aktiviert im Wartungsmodus"), F("zet aan/uit"), F("sätt på/av"))
+MAKE_PSTR_LIST(wwtapactivated, F("wwtapactivated"), F("turn on/off"), F("Durchlauferhitzer aktiv"), F("zet aan/uit"), F("sätt på/av"))
-MAKE_PSTR_LIST(reset, F("reset"), F("Reset"), F("Reset"), F("Nollställ"))
+MAKE_PSTR_LIST(reset, F("reset"), F("Reset"), F("Reset"), F("Nollställ"), F("reset"))
 MAKE_PSTR_LIST(oilPreHeat, F("oilpreheat"), F("oil preheating"), F("Ölvorwärmung"), F("Olie voorverwarming"), F("Förvärmning olja"))
 MAKE_PSTR_LIST(heatingActive, F("heatingactive"), F("heating active"), F("Heizen aktiv"), F("Verwarming actief"), F("Uppvärmning aktiv"))
 MAKE_PSTR_LIST(tapwaterActive, F("tapwateractive"), F("tapwater active"), F("Warmwasser aktiv"), F("Warm water actief"), F("Varmvatten aktiv"))
@@ -204,10 +210,10 @@ MAKE_PSTR_LIST(retTemp, F("rettemp"), F("return temperature"), F("Rücklauftempe
 MAKE_PSTR_LIST(switchTemp, F("switchtemp"), F("mixing switch temperature"), F("Mischer Schalttemperatur"), F("Mixer temperatuur"), F("Blandartemperatur"))
 MAKE_PSTR_LIST(sysPress, F("syspress"), F("system pressure"), F("Systemdruck"), F("Systeemdruk"), F("systemtryck"))
 MAKE_PSTR_LIST(boilTemp, F("boiltemp"), F("actual boiler temperature"), F("Kesseltemperatur"), F("Keteltemperatuur"), F("Temperatur Värmepanna"))
-MAKE_PSTR_LIST(exhaustTemp, F("exhausttemp"), F("exhaust temperature"), F("Auslasstemperatur"), F("Uitlaattemperatuur"), F("Avgastemperatur"))
+MAKE_PSTR_LIST(exhaustTemp, F("exhausttemp"), F("exhaust temperature"), F("Abgastemperatur"), F("Uitlaattemperatuur"), F("Avgastemperatur"))
 MAKE_PSTR_LIST(burnGas, F("burngas"), F("gas"), F("Gas"), F("Gas"), F("Gas"))
 MAKE_PSTR_LIST(burnGas2, F("burngas2"), F("gas stage 2"), F("Gas Stufe 2"), F("gas fase 2"), F("Gas Fas 2"))
-MAKE_PSTR_LIST(flameCurr, F("flamecurr"), F("flame current"), F("Flammstrom"), F("Vlammenstroom"), F("Lågström"))
+MAKE_PSTR_LIST(flameCurr, F("flamecurr"), F("flame current"), F("Flammenstrom"), F("Vlammenstroom"), F("Lågström"))
 MAKE_PSTR_LIST(heatingPump, F("heatingpump"), F("heating pump"), F("Heizungspumpe"), F("Verwarmingspomp"), F("Värmepump"))
 MAKE_PSTR_LIST(fanWork, F("fanwork"), F("fan"), F("Gebläse"), F("Ventilator"), F("Fläkt"))
 MAKE_PSTR_LIST(ignWork, F("ignwork"), F("ignition"), F("Zündung"), F("Ontsteking"), F("Tändning"))
@@ -215,7 +221,7 @@ MAKE_PSTR_LIST(heatingActivated, F("heatingactivated"), F("heating activated"),
 MAKE_PSTR_LIST(heatingTemp, F("heatingtemp"), F("heating temperature"), F("Heizungstemperatur"), F("Verwarmingstemperatuur"), F("Uppvärmningstemperatur"))
 MAKE_PSTR_LIST(pumpModMax, F("pumpmodmax"), F("boiler pump max power"), F("Kesselpumpen Maximalleistung"), F("Ketelpomp max vermogen"), F("Värmepannepump max effekt"))
 MAKE_PSTR_LIST(pumpModMin, F("pumpmodmin"), F("boiler pump min power"), F("Kesselpumpen Minmalleistung"), F("Ketelpomp min vermogen"), F("Värmepannepump min effekt"))
-MAKE_PSTR_LIST(pumpDelay, F("pumpdelay"), F("pump delay"), F("Pumpennachlauf"), F("Pomp nalooptijd"), F("Pumpfördröjning"))
+MAKE_PSTR_LIST(pumpDelay, F("pumpdelay"), F("pump delay"), F("Pumpennachlaufzeit"), F("Pomp nalooptijd"), F("Pumpfördröjning"))
 MAKE_PSTR_LIST(burnMinPeriod, F("burnminperiod"), F("burner min period"), F("Antipendelzeit"), F("Antipendeltijd"), F("Värmepanna Min Period"))
 MAKE_PSTR_LIST(burnMinPower, F("burnminpower"), F("burner min power"), F("minimale Brennerleistung"), F("Minimaal brandervermogen"), F("Värmepanna Min Effekt"))
 MAKE_PSTR_LIST(burnMaxPower, F("burnmaxpower"), F("burner max power"), F("maximale Brennerleistung"), F("Maximaal brandervermogen"), F("Värmepanna Max Effekt"))
@@ -248,7 +254,7 @@ MAKE_PSTR_LIST(burn2WorkMin,
                F("Totale looptijd brander fase 2"),
                F("Värmepanna steg 2 aktiva timmar"))
 MAKE_PSTR_LIST(heatWorkMin, F("heatworkmin"), F("total heat operating time"), F("Heizung Laufzeit"), F("Totale looptijd verwarming"), F("Uppvärmning aktiva timmar"))
-MAKE_PSTR_LIST(UBAuptime, F("ubauptime"), F("total UBA operating time"), F("gesamte Laufzeit"), F("totale looptijd branderautomaat (UBA)"), F("Total Tid"))
+MAKE_PSTR_LIST(UBAuptime, F("ubauptime"), F("total UBA operating time"), F("Anlagen-Gesamtlaufzeit"), F("totale looptijd branderautomaat (UBA)"), F("Total Tid"))
 MAKE_PSTR_LIST(lastCode, F("lastcode"), F("last error code"), F("Fehlerspeicher"), F("Laatste foutcode"), F("Senaste Felkod"))
 MAKE_PSTR_LIST(serviceCode, F("servicecode"), F("service code"), F("Statusmeldung"), F("Statuscode"), F("Servicekod"))
 MAKE_PSTR_LIST(serviceCodeNumber, F("servicecodenumber"), F("service code number"), F("Statusmeldungsnummer"), F("Status codenummer"), F("Servicekodsnummer"))
@@ -294,13 +300,7 @@ MAKE_PSTR_LIST(totalCompStarts,
 MAKE_PSTR_LIST(heatingStarts, F("heatingstarts"), F("heating control starts"), F("Heizen Starts"), F("Starts verwarmingsbedrijf"), F("Kompressorstarter Uppvärmning"))
 MAKE_PSTR_LIST(coolingStarts, F("coolingstarts"), F("cooling control starts"), F("Kühlen Starts"), F("Starts koelbedrijf"), F("Kompressorstarter Kyla"))
 MAKE_PSTR_LIST(poolStarts, F("poolstarts"), F("pool control starts"), F("Pool Starts"), F("Starts zwembadbedrijf"), F("Kompressorstarter Pool"))
-MAKE_PSTR_LIST(nrgConsTotal,
+MAKE_PSTR_LIST(nrgConsTotal, F("nrgconstotal"), F("total energy consumption"), F("totaler Energieverbrauch"), F("Energieverbrauch gesamt"), F("Energieverbruik totaal"))
-               F("nrgconstotal"),
-               F("total energy consumption"),
-               F("totaler Energieverbrauch"),
-               F("Energieverbrauch gesamt"),
-               F("Energieverbruik totaal"),
-               F("Energiförbrukning"))
 MAKE_PSTR_LIST(nrgConsCompTotal,
                F("nrgconscomptotal"),
                F("total energy consumption compressor"),
@@ -394,9 +394,9 @@ MAKE_PSTR_LIST(hpBrineOut, F("hpbrineout"), F("brine out/condenser"), F("Sole au
 MAKE_PSTR_LIST(hpSuctionGas, F("hpsuctiongas"), F("suction gas"), F("Gasansaugung"), F("Gasaanzuiging"), F("Gasintag"))
 MAKE_PSTR_LIST(hpHotGas, F("hphotgas"), F("hot gas/compressed"), F("Heißgas/verdichtet"), F("heet gas/samengeperst"), F("Hetgas/komprimerad"))
 MAKE_PSTR_LIST(hpSwitchValve, F("hpswitchvalve"), F("switch valve"), F("Schaltventil"), F("schakelklep"), F("Växelventil"))
-MAKE_PSTR_LIST(hpActivity, F("hpactivity"), F("compressor activity"), F("Kompressor aktiv"), F("Compressoractiviteit"), F("Kompressoraktivitet"))
+MAKE_PSTR_LIST(hpActivity, F("hpactivity"), F("compressor activity"), F("Kompressoraktivität"), F("Compressoractiviteit"), F("Kompressoraktivitet"))
 
-MAKE_PSTR_LIST(hpPower, F("hppower"), F("compressor power output"), F("Kopressorleistung"), F("Compressorvermogen"), F("Kompressoreffekt"))
+MAKE_PSTR_LIST(hpPower, F("hppower"), F("compressor power output"), F("Kompressorleistung"), F("Compressorvermogen"), F("Kompressoreffekt"))
 MAKE_PSTR_LIST(hpTc0, F("hptc0"), F("heat carrier return (TC0)"), F("Kältemittel Rücklauf (TC0)"), F("Koudemiddel retour (TC0O"), F("Värmebärare Retur (TC0)"))
 MAKE_PSTR_LIST(hpTc1, F("hptc1"), F("heat carrier forward (TC1)"), F("Kältemittel Vorlauf (TC1)"), F("Koudemiddel aanvoer (TC1)"), F("Värmebärare Framledning (TC1)"))
 MAKE_PSTR_LIST(hpTc3, F("hptc3"), F("condenser temperature (TC3)"), F("Verflüssigertemperatur (TC3)"), F("Condensortemperatuur (TC3)"), F("Kondensortemperatur (TC3)"))
@@ -439,7 +439,7 @@ MAKE_PSTR_LIST(hpTl2,
 MAKE_PSTR_LIST(hpPl1,
                F("hppl1"),
                F("low pressure side temperature (PL1)"),
-               F("Niedrigdruckfühler (PL1)"),
+               F("Niederdruckfühler (PL1)"),
                F("Temperatuur lage drukzijde (PL1)"),
                F("Temperatur Lågtryckssidan (PL1)"))
 MAKE_PSTR_LIST(hpPh1,
@@ -466,7 +466,7 @@ MAKE_PSTR_LIST(switchOverTemp,
                F("Außentemperatur für Umschaltung"),
                F("Schakeltemperatuur buitentemperatuur"),
                F("Utomhus Omställningstemperatur"))
-MAKE_PSTR_LIST(energyCostRatio, F("energycostratio"), F("energy cost ratio"), F("Energie-Kosten-Verhältnis"), F("Energiekostenratio"), F("Energi/Kostnads-förhållande"))
+MAKE_PSTR_LIST(energyCostRatio, F("energycostratio"), F("energy cost ratio"), F("Energie/Kosten-Verhältnis"), F("Energiekostenratio"), F("Energi/Kostnads-förhållande"))
 MAKE_PSTR_LIST(fossileFactor,
                F("fossilefactor"),
                F("fossile energy factor"),
@@ -488,22 +488,17 @@ MAKE_PSTR_LIST(tempDiffBoiler,
                F("Temperaturskillnadsoption"))
 
 // alternative heatsource AM200
-MAKE_PSTR_LIST(aCylTopTemp,
+MAKE_PSTR_LIST(aCylTopTemp, F("cyltoptemp"), F("cylinder top temperature"), F("Speichertemperatur Oben"), F("Buffer temperatuur boven"), F("Cylindertemperatur Toppen"))
-               F("cyltoptemp"),
-               F("cylinder top temperature"),
-               F("Speicher oben Temperatur"),
-               F("Buffer temperatuur boven"),
-               F("Cylindertemperatur Toppen"))
 MAKE_PSTR_LIST(aCylCenterTemp,
                F("cylcentertemp"),
                F("cylinder center temperature"),
-               F("Speicher mitte Temperatur"),
+               F("Speichertemperatur Mitte"),
                F("Buffer temperatuur midden"),
                F("Cylindertemperatur Mitten"))
 MAKE_PSTR_LIST(aCylBottomTemp,
                F("cylbottomtemp"),
                F("cylinder bottom temperature"),
-               F("Speicher unten Temperatur"),
+               F("Speichertemperatur Unten"),
                F("Buffer temperatuur onder"),
                F("Cylindertemperatur Botten"))
 MAKE_PSTR_LIST(aFlowTemp,
@@ -544,12 +539,12 @@ MAKE_PSTR_LIST(ahsActivated,
                F("Altenatieve warmtebron geactiveerd"),
                F("Alternativ värmekälla aktivering"))
 MAKE_PSTR_LIST(aPumpConfig, F("apumpconfig"), F("primary pump config"), F("Konfig. Hauptpumpe"), F("Primaire pomp configuratie"), F("Konfiguration Primärpump"))
-MAKE_PSTR_LIST(aPumpSignal, F("apumpsignal"), F("output for pr1 pump"), F("Signal Hauptpumpe"), F("Output voor pomp PR1"), F("Utgång från pump PR1"))
+MAKE_PSTR_LIST(aPumpSignal, F("apumpsignal"), F("output for pr1 pump"), F("Ausgang Pumpe PR1"), F("Output voor pomp PR1"), F("Utgång från pump PR1"))
 MAKE_PSTR_LIST(aPumpMin, F("apumpmin"), F("min output pump pr1"), F("Minimale Pumpenansteuerung"), F("Minimale output pomp PR1"), F("Min Output Pump PR1"))
 MAKE_PSTR_LIST(tempRise, F("temprise"), F("ahs return temp rise"), F("Rücklauf Temperaturerhöhung"), F("Verhoging retourtemperatuur"), F("Förhöjd returtemperatur"))
 MAKE_PSTR_LIST(setReturnTemp, F("setreturntemp"), F("set temp return"), F("Soll-Rücklauftemperatur"), F("Streeftemperatuur retour"), F("Vald returtemperatur"))
 MAKE_PSTR_LIST(mixRuntime, F("mixruntime"), F("mixer run time"), F("Mischer-Laufzeit"), F("Mixer looptijd"), F("Blandningsventil drifttid"))
-MAKE_PSTR_LIST(bufBypass, F("bufbypass"), F("buffer bypass config"), F("Konfig. Bypass"), F("Buffer bypass configuratie"), F("Konfiguration Buffer bypass"))
+MAKE_PSTR_LIST(bufBypass, F("bufbypass"), F("buffer bypass config"), F("Puffer-Bypass Konfig."), F("Buffer bypass configuratie"), F("Konfiguration Buffer bypass"))
 MAKE_PSTR_LIST(bufMixRuntime,
                F("bufmixruntime"),
                F("bypass mixer run time"),
@@ -570,7 +565,7 @@ MAKE_PSTR_LIST(blockTerm,
                F("Configuratie blookerterminal"),
                F("Konfiguration Blockeringsterminal"))
 MAKE_PSTR_LIST(blockHyst, F("blockhyst"), F("hyst. for boiler block"), F("Hysterese Sperrmodus"), F("Hysterese blokeerterminal"), F("Hysteres Blockeringsmodul"))
-MAKE_PSTR_LIST(releaseWait, F("releasewait"), F("boiler release wait time"), F("Wartezeit Freigabe"), F("Wachttijd ketel vrijgave"), F("Väntetid Frisläppning"))
+MAKE_PSTR_LIST(releaseWait, F("releasewait"), F("boiler release wait time"), F("Wartezeit Kessel-Freigabe"), F("Wachttijd ketel vrijgave"), F("Väntetid Frisläppning"))
 
 // the following are dhw for the boiler and automatically tagged with 'dhw'
 MAKE_PSTR_LIST(wwSelTempLow,
@@ -616,7 +611,7 @@ MAKE_PSTR_LIST(wwCircPump,
                F("Zirkulationspumpe vorhanden"),
                F("Circulatiepomp aanwezig"),
                F("Cirkulationspump tillgänglig"))
-MAKE_PSTR_LIST(wwChargeType, F("wwchargetype"), F("charging type"), F("Ladungstyp"), F("Buffer laadtype"), F("Laddningstyp"))
+MAKE_PSTR_LIST(wwChargeType, F("wwchargetype"), F("charging type"), F("Speicher-Ladungstyp"), F("Buffer laadtype"), F("Laddningstyp"))
 MAKE_PSTR_LIST(wwDisinfectionTemp,
                F("wwdisinfectiontemp"),
                F("disinfection temperature"),
@@ -702,10 +697,10 @@ MAKE_PSTR_LIST(errorCode, F("errorcode"), F("error code"), F("Fehlermeldung"), F
 MAKE_PSTR_LIST(ibaMainDisplay, F("display"), F("display"), F("Anzeige"), F("Display"), F("Display"))
 MAKE_PSTR_LIST(ibaLanguage, F("language"), F("language"), F("Sprache"), F("Taal"), F("Språk"))
 MAKE_PSTR_LIST(ibaClockOffset, F("clockoffset"), F("clock offset"), F("Uhrkorrektur"), F("Klokcorrectie"), F("Tidskorrigering"))
-MAKE_PSTR_LIST(ibaBuildingType, F("building"), F("building type"), F("Gebäude"), F("Byggnadstyp"))
+MAKE_PSTR_LIST(ibaBuildingType, F("building"), F("building type"), F("Gebäudetyp"), F(""), F("Byggnadstyp"))
-MAKE_PSTR_LIST(heatingPID, F("heatingpid"), F("heating PID"), F("Heizungs-PID"), F("Uppvärmning PID"))
+MAKE_PSTR_LIST(heatingPID, F("heatingpid"), F("heating PID"), F("Heizungs-PID"), F(""), F("Uppvärmning PID"))
-MAKE_PSTR_LIST(ibaCalIntTemperature, F("intoffset"), F("internal temperature offset"), F("Korrektur interner Temperatur"), F("Korrigering interntemperatur"))
+MAKE_PSTR_LIST(ibaCalIntTemperature, F("intoffset"), F("internal temperature offset"), F("Korrektur interner Temperatur"), F(""), F("Korrigering interntemperatur"))
-MAKE_PSTR_LIST(ibaMinExtTemperature, F("minexttemp"), F("minimal external temperature"), F("min. Aussentemperatur"), F("Min Extern Temperatur"))
+MAKE_PSTR_LIST(ibaMinExtTemperature, F("minexttemp"), F("minimal external temperature"), F("min. Aussentemperatur"), F(""), F("Min Extern Temperatur"))
 MAKE_PSTR_LIST(backlight, F("backlight"), F("key backlight"), F("Gegenlicht"), F("Toetsverlichting"), F("Bakgrundsbelysning"))
 MAKE_PSTR_LIST(damping,
                F("damping"),
@@ -783,21 +778,21 @@ MAKE_PSTR_LIST(manualtemp, F("manualtemp"), F("manual temperature"), F("manuelle
 MAKE_PSTR_LIST(tempautotemp,
                F("tempautotemp"),
                F("temporary set temperature automode"),
-               F("zwischenzeitliche Solltemperatur"),
+               F("temporäre Solltemperatur"),
                F("Streeftemperatuur automodus tijdelijk"),
                F("Temporär Aktivering av Auto-läge"))
 MAKE_PSTR_LIST(remoteseltemp,
                F("remoteseltemp"),
                F("temporary set temperature from remote"),
-               F("Temperatur von Fernsteuerung"),
+               F("temporäre Solltemperatur Remote"),
                F("Temperatuur van afstandsbedieding"),
                F("Temperatur från fjärruppkoppling"))
 MAKE_PSTR_LIST(comforttemp, F("comforttemp"), F("comfort temperature"), F("Komforttemperatur"), F("Comforttemperatuur"), F("Komforttemperatur"))
 MAKE_PSTR_LIST(summertemp, F("summertemp"), F("summer temperature"), F("Sommertemperatur"), F("Zomertemperatuur"), F("Sommartemperatur"))
 MAKE_PSTR_LIST(designtemp, F("designtemp"), F("design temperature"), F("Auslegungstemperatur"), F("Ontwerptemperatuur"), F("Design-temperatur"))
 MAKE_PSTR_LIST(offsettemp, F("offsettemp"), F("offset temperature"), F("Temperaturanhebung"), F("Temperatuur offset"), F("Temperaturkorrigering"))
-MAKE_PSTR_LIST(minflowtemp, F("minflowtemp"), F("min flow temperature"), F("min Vorlauftemperatur"), F("Min Flödestemperatur"))
+MAKE_PSTR_LIST(minflowtemp, F("minflowtemp"), F("min flow temperature"), F("min Vorlauftemperatur"), F(""), F("Min Flödestemperatur"))
-MAKE_PSTR_LIST(maxflowtemp, F("maxflowtemp"), F("max flow temperature"), F("max Vorlauftemperatur"), F("Max Flödestemperatur"))
+MAKE_PSTR_LIST(maxflowtemp, F("maxflowtemp"), F("max flow temperature"), F("max Vorlauftemperatur"), F(""), F("Max Flödestemperatur"))
 MAKE_PSTR_LIST(roominfluence, F("roominfluence"), F("room influence"), F("Raumeinfluss"), F("Ruimteinvloed"), F("Rumspåverkan"))
 MAKE_PSTR_LIST(roominfl_factor, F("roominflfactor"), F("room influence factor"), F("Raumeinfluss Factor"), F("Factor ruimteinvloed"), F("Rumspåverkansfaktor"))
 MAKE_PSTR_LIST(curroominfl, F("curroominfl"), F("current room influence"), F("aktueller Raumeinfluss"), F("Huidige ruimteinvloed"), F("Aktuell Rumspåverkan"))
@@ -835,7 +830,7 @@ MAKE_PSTR_LIST(reducemode, F("reducemode"), F("reduce mode"), F("Absenkmodus"),
 MAKE_PSTR_LIST(noreducetemp,
                F("noreducetemp"),
                F("no reduce below temperature"),
-               F("Absenkung unterbrechen unter"),
+               F("Durchheizen unter"),
                F("Reduceermodus onderbreken onder"),
                F("Inaktivera reducering under"))
 MAKE_PSTR_LIST(reducetemp, F("reducetemp"), F("off/reduce switch temperature"), F("Absenkmodus unter"), F("Onderste afschakeltemperatuur"), F("Avslag/Reducera under"))
@@ -850,7 +845,7 @@ MAKE_PSTR_LIST(nofrostmode, F("nofrostmode"), F("nofrost mode"), F("Frostschutz
 MAKE_PSTR_LIST(remotetemp,
                F("remotetemp"),
                F("room temperature from remote"),
-               F("Raumtemperatur der Fernsteuerung"),
+               F("Raumtemperatur Remote"),
                F("Ruimtetemperatuur van afstandsbediening"),
                F("Rumstemperatur från fjärr"))
 
@@ -870,7 +865,7 @@ MAKE_PSTR_LIST(reduceminutes,
 MAKE_PSTR_LIST(switchonoptimization,
                F("switchonoptimization"),
                F("switch-on optimization"),
-               F("Schaltoptimierung"),
+               F("Einschaltoptimierung"),
                F("Inschakeloptimalisering"),
                F("Växlingsoptimering"))
 
@@ -888,10 +883,10 @@ MAKE_PSTR_LIST(flowSetTemp,
 MAKE_PSTR_LIST(flowTempHc,
                F("flowtemphc"),
                F("flow temperature (TC1)"),
-               F("Vorlauftemperatur des HK (TC1)"),
+               F("Vorlauftemperatur HK (TC1)"),
                F("Aanvoertemperatuut circuit (TC1)"),
                F("Flödestemperatur (TC1)"))
-MAKE_PSTR_LIST(pumpStatus, F("pumpstatus"), F("pump status (PC1)"), F("Pumpenstatus des HK (PC1)"), F("pompstatus circuit (PC1)"), F("Pumpstatus (PC1)"))
+MAKE_PSTR_LIST(pumpStatus, F("pumpstatus"), F("pump status (PC1)"), F("Pumpenstatus HK (PC1)"), F("pompstatus circuit (PC1)"), F("Pumpstatus (PC1)"))
 MAKE_PSTR_LIST(mixerStatus,
                F("valvestatus"),
                F("mixing valve actuator (VC1)"),
@@ -1052,7 +1047,12 @@ MAKE_PSTR_LIST(cylPumpMod,
                F("Cylinderpumpmodulering (PS5)"))
 MAKE_PSTR_LIST(solarPump, F("solarpump"), F("pump (PS1)"), F("Pumpe (PS1)"), F("Pomp (PS1)"), F("Pump (PS1)"))
 MAKE_PSTR_LIST(solarPump2, F("solarpump2"), F("pump 2 (PS4)"), F("Pumpe 2 (PS4)"), F("Pomp 2 (PS4)"), F("Pump 2 (PS4)"))
-MAKE_PSTR_LIST(solarPump2Mod, F("solarpump2mod"), F("pump 2 modulation (PS4)"), F("pump 2 modulation (PS4)"), F("Modulatie pomp 2 (PS4)"), F("Pump 2 Modulering (PS4)"))
+MAKE_PSTR_LIST(solarPump2Mod,
+               F("solarpump2mod"),
+               F("pump 2 modulation (PS4)"),
+               F("Pumpe 2 Modulation (PS4)"),
+               F("Modulatie pomp 2 (PS4)"),
+               F("Pump 2 Modulering (PS4)"))
 MAKE_PSTR_LIST(valveStatus, F("valvestatus"), F("valve status"), F("Ventilstatus"), F("Klepstatus"), F("Ventilstatus"))
 MAKE_PSTR_LIST(cylHeated, F("cylheated"), F("cyl heated"), F("Speichertemperatur erreicht"), F("Boilertemperatuur behaald"), F("Värmepanna Uppvärmd"))
 MAKE_PSTR_LIST(collectorShutdown, F("collectorshutdown"), F("collector shutdown"), F("Kollektorabschaltung"), F("Collector afschakeling"), F("Kollektor Avstängning"))
@@ -1069,8 +1069,6 @@ MAKE_PSTR_LIST(energyTotal, F("energytotal"), F("total energy"), F("Gesamtenergi
 MAKE_PSTR_LIST(energyToday, F("energytoday"), F("total energy today"), F("Energie heute"), F("Energie vandaag"), F("Total Energi Idag"))
 
 // solar ww
-MAKE_PSTR_LIST(cyl1, F("cyl 1"), F("Zyl_1"), F("Cil 1"), F("Cyl 1"))
-MAKE_PSTR_LIST(cyl2, F("cyl 2"), F("Zyl_2"), F("Cil 2"), F("Cyl 2"))
 MAKE_PSTR_LIST(wwTemp1, F("wwtemp1"), F("temperature 1"), F("Temperatur 1"), F("Temperatuur 1"), F("Temperatur 1"))
 MAKE_PSTR_LIST(wwTemp3, F("wwtemp3"), F("temperature 3"), F("Temperatur 3"), F("Temperatuur 2"), F("Temperatur 2"))
 MAKE_PSTR_LIST(wwTemp4, F("wwtemp4"), F("temperature 4"), F("Temperatur 4"), F("Temperatuur 3"), F("Temperatur 3"))
@@ -1079,12 +1077,12 @@ MAKE_PSTR_LIST(wwTemp7, F("wwtemp7"), F("temperature 7"), F("Temperatur 7"), F("
 MAKE_PSTR_LIST(wwPump, F("wwpump"), F("pump"), F("Pumpe"), F("Pomp"), F("Pump"))
 // solar ww and mixer wwc
 MAKE_PSTR_LIST(wwMinTemp, F("wwmintemp"), F("minimum temperature"), F("minimale Temperatur"), F("Minimale temperatuur"), F("Min Temperatur"))
-MAKE_PSTR_LIST(wwRedTemp, F("wwredtemp"), F("reduced temperature"), F("redizierte Temperatur"), F("Gereduceerde temperatuur"), F("Reducerad Temperatur"))
+MAKE_PSTR_LIST(wwRedTemp, F("wwredtemp"), F("reduced temperature"), F("reduzierte Temperatur"), F("Gereduceerde temperatuur"), F("Reducerad Temperatur"))
 MAKE_PSTR_LIST(wwDailyTemp, F("wwdailytemp"), F("daily temperature"), F("tägl. Temperatur"), F("Dagelijkse temperatuur"), F("Daglig temperatur"))
 MAKE_PSTR_LIST(wwKeepWarm, F("wwkeepwarm"), F("keep warm"), F("Warmhalten"), F("Warm houde"), F("Varmhållning"))
 MAKE_PSTR_LIST(wwStatus2, F("wwstatus2"), F("status 2"), F("Status 2"), F("Status 2"), F("Status 2"))
 MAKE_PSTR_LIST(wwPumpMod, F("wwpumpmod"), F("pump modulation"), F("Pumpen Modulation"), F("Pompmodulatie"), F("Pumpmodulering"))
-MAKE_PSTR_LIST(wwFlow, F("wwflow"), F("flow rate"), F("Flussrate"), F("Doorstroomsnelheid"), F("Flöde"))
+MAKE_PSTR_LIST(wwFlow, F("wwflow"), F("flow rate"), F("Volumenstrom"), F("Doorstroomsnelheid"), F("Flöde"))
 // extra mixer ww
 MAKE_PSTR_LIST(wwRequiredTemp, F("wwrequiredtemp"), F("required temperature"), F("benötigte Temperatur"), F("Benodigde temperatuur"), F("Nödvändig Temperatur"))
 MAKE_PSTR_LIST(wwDiffTemp,
@@ -1098,7 +1096,7 @@ MAKE_PSTR_LIST(wwDiffTemp,
 MAKE_PSTR_LIST(heatTransferSystem,
                F("heattransfersystem"),
                F("heattransfer system"),
-               F("Wärmetransfer System"),
+               F("Wärmeübertragungs-System"),
                F("Warmteoverdrachtssysteem"),
                F("Värmeöverföringssystem"))
 MAKE_PSTR_LIST(externalCyl, F("externalcyl"), F("external cylinder"), F("Externer Speicher"), F("Externe boiler"), F("Extern Cylinder"))
@@ -1107,7 +1105,7 @@ MAKE_PSTR_LIST(heatMetering, F("heatmetering"), F("heatmetering"), F("Wärmemess
 MAKE_PSTR_LIST(solarIsEnabled, F("solarenabled"), F("solarmodule enabled"), F("Solarmodul aktiviert"), F("Solarmodule geactiveerd"), F("Solmodul Aktiverad"))
 
 // telegram 0x035A
-MAKE_PSTR_LIST(solarPumpMode, F("solarpumpmode"), F("pump mode"), F("solar Pumpen Einst."), F("Modus zonneboilerpomp"), F("Sol Pumpläge"))
+MAKE_PSTR_LIST(solarPumpMode, F("solarpumpmode"), F("pump mode"), F("Solar Pumpen Einst."), F("Modus zonneboilerpomp"), F("Sol Pumpläge"))
 MAKE_PSTR_LIST(solarPumpKick, F("pumpkick"), F("pump kick"), F("Röhrenkollektorfunktion"), F("Modus buizencollector"), F("Sol Kollektorfunktion"))
 MAKE_PSTR_LIST(plainWaterMode, F("plainwatermode"), F("plain water mode"), F("Südeuropafunktion"), F("Modus Zuid-Europa"), F("Sydeuropa-funktion"))
 MAKE_PSTR_LIST(doubleMatchFlow, F("doublematchflow"), F("doublematchflow"), F("Double Match Flow"), F("Double Match Flow"), F("Dubbelmatchning Flöde"))