diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino
index 63560c599..959c83d8d 100644
--- a/sonoff/_releasenotes.ino
+++ b/sonoff/_releasenotes.ino
@@ -1,4 +1,5 @@
 /* 5.12.0e
+ * Add Domoticz dust (custom) sensors to PMS5003 and NovaFitness SDS drivers as PM1, PM2.5 and PM10
  * Add a second TLS fingerprint to allow switching keys in TLS mode (#2033, #2102)
  * Add display of remaining pulse time to command PulseTime (#2085)
  * Add additional time offset to Wifi Retry based on device mac address (#2089)
diff --git a/sonoff/language/cs-CZ.h b/sonoff/language/cs-CZ.h
index c799d9a37..5f60ae8c1 100644
--- a/sonoff/language/cs-CZ.h
+++ b/sonoff/language/cs-CZ.h
@@ -1,5 +1,5 @@
 /*
-  cz-CZ.h - localization for Czech with diacritics - Czech for Sonoff-Tasmota
+  cs-CZ.h - localization for Czech with diacritics - Czech for Sonoff-Tasmota
 
   Copyright (C) 2018  Theo Arends (translated by vs)
 
@@ -165,13 +165,6 @@
 #define D_DATA_SIZE "Velikost dat"
 #define D_ANALOG_INPUT "Analogový vstup"
 
-#define D_FINGERPRINT "Verifikuj otisk TLS..."
-#define D_TLS_CONNECT_FAILED_TO "Nepřipojeno TLS do"
-#define D_RETRY_IN "Zopakuji za"
-#define D_VERIFIED "Ověřeno otisk "
-#define D_INSECURE "Nesprávné připojení z důvodu chybného otisku TLS"
-#define D_CONNECT_FAILED_TO "Spojení se nepodařilo navázat"
-
 // support.ino
 #define D_OSWATCH "osWatch"
 #define D_BLOCKED_LOOP "Zablokování smyčky"
@@ -320,6 +313,14 @@
 #define D_ENABLE_WEBLOG_FOR_RESPONSE "Zapni úroveň 2 zápisu Weblog, pokud je očekávána odpověď"
 #define D_NEED_USER_AND_PASSWORD "Vyžadován uživatel=<username>&heslo=<password>"
 
+// xdrv_00_mqtt.ino
+#define D_FINGERPRINT "Verifikuj otisk TLS..."
+#define D_TLS_CONNECT_FAILED_TO "Nepřipojeno TLS do"
+#define D_RETRY_IN "Zopakuji za"
+#define D_VERIFIED "Ověřeno otisk "
+#define D_INSECURE "Nesprávné připojení z důvodu chybného otisku TLS"
+#define D_CONNECT_FAILED_TO "Spojení se nepodařilo navázat"
+
 // xdrv_wemohue.ino
 #define D_MULTICAST_DISABLED "Multicast je vypnutý"
 #define D_MULTICAST_REJOINED "Multicast opět připojený"
@@ -351,9 +352,9 @@
   #define D_DOMOTICZ_TEMP_HUM_BARO "Temp,Vlhk,Tlak"
   #define D_DOMOTICZ_POWER_ENERGY "Příkon,Energie"
   #define D_DOMOTICZ_ILLUMINANCE "Osvětlení"
-  #define D_DOMOTICZ_COUNT "Počítadlo"
-  #define D_DOMOTICZ_VOLTAGE "Napětí"
-  #define D_DOMOTICZ_CURRENT "Proud"
+  #define D_DOMOTICZ_COUNT "Počítadlo/PM1"
+  #define D_DOMOTICZ_VOLTAGE "Napětí/PM2,5"
+  #define D_DOMOTICZ_CURRENT "Proud/PM10"
   #define D_DOMOTICZ_AIRQUALITY "AirQuality"
 #define D_DOMOTICZ_UPDATE_TIMER "Aktualizace stopek"
 
diff --git a/sonoff/language/de-DE.h b/sonoff/language/de-DE.h
index 14c525a75..4ba502af3 100644
--- a/sonoff/language/de-DE.h
+++ b/sonoff/language/de-DE.h
@@ -165,13 +165,6 @@
 #define D_DATA_SIZE "Datengröße"
 #define D_ANALOG_INPUT "Analog"
 
-#define D_FINGERPRINT "TLS-Fingerabdruck wird verifiziert..."
-#define D_TLS_CONNECT_FAILED_TO "TLS-Verbindung fehlgeschlagen an"
-#define D_RETRY_IN "Wiederversuch in"
-#define D_VERIFIED "verifiziert mit Fingerabdruck"
-#define D_INSECURE "unsichere Verbindung aufgrund ungültigen Fingerabdrucks"
-#define D_CONNECT_FAILED_TO "Verbindung fehlgeschlagen aufgrund von"
-
 // support.ino
 #define D_OSWATCH "osWatch"
 #define D_BLOCKED_LOOP "Blocked Loop"
@@ -320,6 +313,14 @@
 #define D_ENABLE_WEBLOG_FOR_RESPONSE "Aktivere Web Log Level 2 falls Reaktion erwartet"
 #define D_NEED_USER_AND_PASSWORD "Benutzer benötigt=<Benutzername>&password=<Passwort>"
 
+// xdrv_00_mqtt.ino
+#define D_FINGERPRINT "TLS-Fingerabdruck wird verifiziert..."
+#define D_TLS_CONNECT_FAILED_TO "TLS-Verbindung fehlgeschlagen an"
+#define D_RETRY_IN "Wiederversuch in"
+#define D_VERIFIED "verifiziert mit Fingerabdruck"
+#define D_INSECURE "unsichere Verbindung aufgrund ungültigen Fingerabdrucks"
+#define D_CONNECT_FAILED_TO "Verbindung fehlgeschlagen aufgrund von"
+
 // xdrv_wemohue.ino
 #define D_MULTICAST_DISABLED "Multicast deaktiviert"
 #define D_MULTICAST_REJOINED "Multicast (wieder-)verbunden"
@@ -351,9 +352,9 @@
   #define D_DOMOTICZ_TEMP_HUM_BARO "Temp,Hum,Baro"
   #define D_DOMOTICZ_POWER_ENERGY "Power,Energy"
   #define D_DOMOTICZ_ILLUMINANCE "Illuminance"
-  #define D_DOMOTICZ_COUNT "Count"
-  #define D_DOMOTICZ_VOLTAGE "Voltage"
-  #define D_DOMOTICZ_CURRENT "Current"
+  #define D_DOMOTICZ_COUNT "Count/PM1"
+  #define D_DOMOTICZ_VOLTAGE "Voltage/PM2.5"
+  #define D_DOMOTICZ_CURRENT "Current/PM10"
   #define D_DOMOTICZ_AIRQUALITY "AirQuality"
 #define D_DOMOTICZ_UPDATE_TIMER "Update timer"
 
diff --git a/sonoff/language/en-GB.h b/sonoff/language/en-GB.h
index 80c8518df..99faed325 100644
--- a/sonoff/language/en-GB.h
+++ b/sonoff/language/en-GB.h
@@ -165,13 +165,6 @@
 #define D_DATA_SIZE "Data Size"
 #define D_ANALOG_INPUT "Analog"
 
-#define D_FINGERPRINT "Verify TLS fingerprint..."
-#define D_TLS_CONNECT_FAILED_TO "TLS Connect failed to"
-#define D_RETRY_IN "Retry in"
-#define D_VERIFIED "Verified using Fingerprint"
-#define D_INSECURE "Insecure connection due to invalid Fingerprint"
-#define D_CONNECT_FAILED_TO "Connect failed to"
-
 // support.ino
 #define D_OSWATCH "osWatch"
 #define D_BLOCKED_LOOP "Blocked Loop"
@@ -320,6 +313,14 @@
 #define D_ENABLE_WEBLOG_FOR_RESPONSE "Enable weblog 2 if response expected"
 #define D_NEED_USER_AND_PASSWORD "Need user=<username>&password=<password>"
 
+// xdrv_00_mqtt.ino
+#define D_FINGERPRINT "Verify TLS fingerprint..."
+#define D_TLS_CONNECT_FAILED_TO "TLS Connect failed to"
+#define D_RETRY_IN "Retry in"
+#define D_VERIFIED "Verified using Fingerprint"
+#define D_INSECURE "Insecure connection due to invalid Fingerprint"
+#define D_CONNECT_FAILED_TO "Connect failed to"
+
 // xdrv_wemohue.ino
 #define D_MULTICAST_DISABLED "Multicast disabled"
 #define D_MULTICAST_REJOINED "Multicast (re)joined"
@@ -351,9 +352,9 @@
   #define D_DOMOTICZ_TEMP_HUM_BARO "Temp,Hum,Baro"
   #define D_DOMOTICZ_POWER_ENERGY "Power,Energy"
   #define D_DOMOTICZ_ILLUMINANCE "Illuminance"
-  #define D_DOMOTICZ_COUNT "Count"
-  #define D_DOMOTICZ_VOLTAGE "Voltage"
-  #define D_DOMOTICZ_CURRENT "Current"
+  #define D_DOMOTICZ_COUNT "Count/PM1"
+  #define D_DOMOTICZ_VOLTAGE "Voltage/PM2.5"
+  #define D_DOMOTICZ_CURRENT "Current/PM10"
   #define D_DOMOTICZ_AIRQUALITY "AirQuality"
 #define D_DOMOTICZ_UPDATE_TIMER "Update timer"
 
diff --git a/sonoff/language/es-AR.h b/sonoff/language/es-AR.h
index fee5c40ea..531f78d26 100644
--- a/sonoff/language/es-AR.h
+++ b/sonoff/language/es-AR.h
@@ -165,13 +165,6 @@
 #define D_DATA_SIZE "Tamaño de Datos"
 #define D_ANALOG_INPUT "Entrada Analógica"
 
-#define D_FINGERPRINT "Verificar TLS fingerprint..."
-#define D_TLS_CONNECT_FAILED_TO "Falló Conección TLS a"
-#define D_RETRY_IN "Reintentando"
-#define D_VERIFIED "Verificado Fingerprint"
-#define D_INSECURE "Conección insegura por Fingerprint no válido"
-#define D_CONNECT_FAILED_TO "Falló Conección a"
-
 // support.ino
 #define D_OSWATCH "osWatch"
 #define D_BLOCKED_LOOP "Ciclo Bloqueado"
@@ -320,6 +313,14 @@
 #define D_ENABLE_WEBLOG_FOR_RESPONSE "Habilitar weblog 2 si desea respuesta"
 #define D_NEED_USER_AND_PASSWORD "Se necesita user=<username>&password=<password>"
 
+// xdrv_00_mqtt.ino
+#define D_FINGERPRINT "Verificar TLS fingerprint..."
+#define D_TLS_CONNECT_FAILED_TO "Falló Conección TLS a"
+#define D_RETRY_IN "Reintentando"
+#define D_VERIFIED "Verificado Fingerprint"
+#define D_INSECURE "Conección insegura por Fingerprint no válido"
+#define D_CONNECT_FAILED_TO "Falló Conección a"
+
 // xdrv_wemohue.ino
 #define D_MULTICAST_DISABLED "Multicast deshabilitado"
 #define D_MULTICAST_REJOINED "Multicast (re)conectado"
@@ -351,9 +352,9 @@
   #define D_DOMOTICZ_TEMP_HUM_BARO "Temp,Hum,Baro"
   #define D_DOMOTICZ_POWER_ENERGY "Potencia,Energía"
   #define D_DOMOTICZ_ILLUMINANCE "Luminancia"
-  #define D_DOMOTICZ_COUNT "Contador"
-  #define D_DOMOTICZ_VOLTAGE "Voltaje"
-  #define D_DOMOTICZ_CURRENT "Corriente"
+  #define D_DOMOTICZ_COUNT "Contador/PM1"
+  #define D_DOMOTICZ_VOLTAGE "Voltaje/PM2,5"
+  #define D_DOMOTICZ_CURRENT "Corriente/PM10"
   #define D_DOMOTICZ_AIRQUALITY "Calidad del Aire"
 #define D_DOMOTICZ_UPDATE_TIMER "Intervalo de refresco"
 
diff --git a/sonoff/language/fr-FR.h b/sonoff/language/fr-FR.h
index 8ec6cd1f7..4690bab6e 100644
--- a/sonoff/language/fr-FR.h
+++ b/sonoff/language/fr-FR.h
@@ -165,13 +165,6 @@
 #define D_DATA_SIZE "Taille données"
 #define D_ANALOG_INPUT "Analogique"
 
-#define D_FINGERPRINT "Verification empreinte TLS ..."
-#define D_TLS_CONNECT_FAILED_TO "Echec de connexion TLS à"
-#define D_RETRY_IN "Nouvelle tentative dans"
-#define D_VERIFIED "Verifié empreinte "
-#define D_INSECURE "Connexion non sécurisée car empreinte non vérifée"
-#define D_CONNECT_FAILED_TO "Echec de connexion à"
-
 // support.ino
 #define D_OSWATCH "osWatch"
 #define D_BLOCKED_LOOP "Boucle bloquée"
@@ -320,6 +313,14 @@
 #define D_ENABLE_WEBLOG_FOR_RESPONSE "Activer weblog 2 si response attendue"
 #define D_NEED_USER_AND_PASSWORD "Nécessite utilisateur=<username>&password=<password>"
 
+// xdrv_00_mqtt.ino
+#define D_FINGERPRINT "Verification empreinte TLS ..."
+#define D_TLS_CONNECT_FAILED_TO "Echec de connexion TLS à"
+#define D_RETRY_IN "Nouvelle tentative dans"
+#define D_VERIFIED "Verifié empreinte "
+#define D_INSECURE "Connexion non sécurisée car empreinte non vérifée"
+#define D_CONNECT_FAILED_TO "Echec de connexion à"
+
 // xdrv_wemohue.ino
 #define D_MULTICAST_DISABLED "Multicast désactivé"
 #define D_MULTICAST_REJOINED "Multicast (re)joint"
@@ -351,9 +352,9 @@
   #define D_DOMOTICZ_TEMP_HUM_BARO "Temp,Hum,Baro"
   #define D_DOMOTICZ_POWER_ENERGY "Power,Energy"
   #define D_DOMOTICZ_ILLUMINANCE "Illuminance"
-  #define D_DOMOTICZ_COUNT "Count"
-  #define D_DOMOTICZ_VOLTAGE "Voltage"
-  #define D_DOMOTICZ_CURRENT "Current"
+  #define D_DOMOTICZ_COUNT "Count/PM1"
+  #define D_DOMOTICZ_VOLTAGE "Voltage/PM2,5"
+  #define D_DOMOTICZ_CURRENT "Current/PM10"
   #define D_DOMOTICZ_AIRQUALITY "AirQuality"
 #define D_DOMOTICZ_UPDATE_TIMER "Update timer"
 
diff --git a/sonoff/language/hu-HU.h b/sonoff/language/hu-HU.h
index c07024f11..3d1714c38 100644
--- a/sonoff/language/hu-HU.h
+++ b/sonoff/language/hu-HU.h
@@ -165,13 +165,6 @@
 #define D_DATA_SIZE "Adat Méret"
 #define D_ANALOG_INPUT "Analóg"
 
-#define D_FINGERPRINT "TLS fingerprint hitelesítése..."
-#define D_TLS_CONNECT_FAILED_TO "TLS Csatlakozás sikertelen a"
-#define D_RETRY_IN "Újrapróbálás"
-#define D_VERIFIED "Hitelesítve Fingerprint"
-#define D_INSECURE "Nem biztonságos kapcsolat érvénytelen Fingerprint miatt"
-#define D_CONNECT_FAILED_TO "Sikertelen csatlakozás a"
-
 // support.ino
 #define D_OSWATCH "osWatch"
 #define D_BLOCKED_LOOP "Blocked Loop"
@@ -320,6 +313,14 @@
 #define D_ENABLE_WEBLOG_FOR_RESPONSE "Engedélyezz 2-es weblogolást több információért"
 #define D_NEED_USER_AND_PASSWORD "Kell felhasználó=<felhasználónév>&jelszó=<jelszó>"
 
+// xdrv_00_mqtt.ino
+#define D_FINGERPRINT "TLS fingerprint hitelesítése..."
+#define D_TLS_CONNECT_FAILED_TO "TLS Csatlakozás sikertelen a"
+#define D_RETRY_IN "Újrapróbálás"
+#define D_VERIFIED "Hitelesítve Fingerprint"
+#define D_INSECURE "Nem biztonságos kapcsolat érvénytelen Fingerprint miatt"
+#define D_CONNECT_FAILED_TO "Sikertelen csatlakozás a"
+
 // xdrv_wemohue.ino
 #define D_MULTICAST_DISABLED "Multicast kikapcsolva"
 #define D_MULTICAST_REJOINED "Multicast (újra)csatlakozás"
@@ -351,9 +352,9 @@
   #define D_DOMOTICZ_TEMP_HUM_BARO "Hőm,Párat,Légny"
   #define D_DOMOTICZ_POWER_ENERGY "Teljesítmény,Energia"
   #define D_DOMOTICZ_ILLUMINANCE "Fényerő"
-  #define D_DOMOTICZ_COUNT "Szám"
-  #define D_DOMOTICZ_VOLTAGE "Feszültség"
-  #define D_DOMOTICZ_CURRENT "Áram"
+  #define D_DOMOTICZ_COUNT "Szám/PM1"
+  #define D_DOMOTICZ_VOLTAGE "Feszültség/PM2.5"
+  #define D_DOMOTICZ_CURRENT "Áram/PM10"
   #define D_DOMOTICZ_AIRQUALITY "Légminőség"
 #define D_DOMOTICZ_UPDATE_TIMER "Update időzítő"
 
diff --git a/sonoff/language/it-IT.h b/sonoff/language/it-IT.h
index 07499c821..67752fd81 100644
--- a/sonoff/language/it-IT.h
+++ b/sonoff/language/it-IT.h
@@ -165,13 +165,6 @@
 #define D_DATA_SIZE "Dimensione Dati"
 #define D_ANALOG_INPUT "Ingresso Analogico"
 
-#define D_FINGERPRINT "Verifica TLS fingerprint..."
-#define D_TLS_CONNECT_FAILED_TO "Connessione TLS fallita a"
-#define D_RETRY_IN "Nuovo tentativo in"
-#define D_VERIFIED "Verificato Fingerprint"
-#define D_INSECURE "Connessione insicura a causa di Fingerprint non valido"
-#define D_CONNECT_FAILED_TO "Connessione Fallita a"
-
 // support.ino
 #define D_OSWATCH "osWatch"
 #define D_BLOCKED_LOOP "Ciclo Bloccato"
@@ -320,6 +313,14 @@
 #define D_ENABLE_WEBLOG_FOR_RESPONSE "Abilitare weblog 2 se e' attesa una risposta"
 #define D_NEED_USER_AND_PASSWORD "Richiesto user=<username>&password=<password>"
 
+// xdrv_00_mqtt.ino
+#define D_FINGERPRINT "Verifica TLS fingerprint..."
+#define D_TLS_CONNECT_FAILED_TO "Connessione TLS fallita a"
+#define D_RETRY_IN "Nuovo tentativo in"
+#define D_VERIFIED "Verificato Fingerprint"
+#define D_INSECURE "Connessione insicura a causa di Fingerprint non valido"
+#define D_CONNECT_FAILED_TO "Connessione Fallita a"
+
 // xdrv_wemohue.ino
 #define D_MULTICAST_DISABLED "Multicast disabilitato"
 #define D_MULTICAST_REJOINED "Multicast (ri)associato"
@@ -351,9 +352,9 @@
   #define D_DOMOTICZ_TEMP_HUM_BARO "Temp,Hum,Baro"
   #define D_DOMOTICZ_POWER_ENERGY "Power,Energy"
   #define D_DOMOTICZ_ILLUMINANCE "Illuminance"
-  #define D_DOMOTICZ_COUNT "Count"
-  #define D_DOMOTICZ_VOLTAGE "Voltage"
-  #define D_DOMOTICZ_CURRENT "Current"
+  #define D_DOMOTICZ_COUNT "Count/PM1"
+  #define D_DOMOTICZ_VOLTAGE "Voltage/PM2.5"
+  #define D_DOMOTICZ_CURRENT "Current/PM10"
   #define D_DOMOTICZ_AIRQUALITY "AirQuality"
 #define D_DOMOTICZ_UPDATE_TIMER "Intervallo di aggiornamento"
 
diff --git a/sonoff/language/nl-NL.h b/sonoff/language/nl-NL.h
index 918f9bddd..3a02ded56 100644
--- a/sonoff/language/nl-NL.h
+++ b/sonoff/language/nl-NL.h
@@ -165,13 +165,6 @@
 #define D_DATA_SIZE "Data lengte"
 #define D_ANALOG_INPUT "Analoog"
 
-#define D_FINGERPRINT "Controleer TLS vingerafdruk..."
-#define D_TLS_CONNECT_FAILED_TO "TLS Verbinding mislukt naar"
-#define D_RETRY_IN "Opnieuw proberen over"
-#define D_VERIFIED "Gecontroleerd met vingerafdruk"
-#define D_INSECURE "Door ongeldige vingerafdruk een onveilige verbinding"
-#define D_CONNECT_FAILED_TO "Verbinding mislukt naar"
-
 // support.ino
 #define D_OSWATCH "osWatch"
 #define D_BLOCKED_LOOP "Blocked Loop"
@@ -320,6 +313,14 @@
 #define D_ENABLE_WEBLOG_FOR_RESPONSE "Schakel weblog 2 in indien antwoord verwacht"
 #define D_NEED_USER_AND_PASSWORD "Benodig user=<gebruiker>&password=<webwachtwoord>"
 
+// xdrv_00_mqtt.ino
+#define D_FINGERPRINT "Controleer TLS vingerafdruk..."
+#define D_TLS_CONNECT_FAILED_TO "TLS Verbinding mislukt naar"
+#define D_RETRY_IN "Opnieuw proberen over"
+#define D_VERIFIED "Gecontroleerd met vingerafdruk"
+#define D_INSECURE "Door ongeldige vingerafdruk een onveilige verbinding"
+#define D_CONNECT_FAILED_TO "Verbinding mislukt naar"
+
 // xdrv_wemohue.ino
 #define D_MULTICAST_DISABLED "Multicast uitgeschakeld"
 #define D_MULTICAST_REJOINED "Multicast verbonden"
@@ -351,9 +352,9 @@
   #define D_DOMOTICZ_TEMP_HUM_BARO "Temp,Hum,Baro"
   #define D_DOMOTICZ_POWER_ENERGY "Power,Energy"
   #define D_DOMOTICZ_ILLUMINANCE "Illuminance"
-  #define D_DOMOTICZ_COUNT "Count"
-  #define D_DOMOTICZ_VOLTAGE "Spanning"
-  #define D_DOMOTICZ_CURRENT "Stroom"
+  #define D_DOMOTICZ_COUNT "Count/PM1"
+  #define D_DOMOTICZ_VOLTAGE "Spanning/PM2,5"
+  #define D_DOMOTICZ_CURRENT "Stroom/PM10"
   #define D_DOMOTICZ_AIRQUALITY "AirQuality"
 #define D_DOMOTICZ_UPDATE_TIMER "Bijwerk timer"
 
diff --git a/sonoff/language/pl-PL.h b/sonoff/language/pl-PL.h
index 4542d826d..6acc8a7f6 100644
--- a/sonoff/language/pl-PL.h
+++ b/sonoff/language/pl-PL.h
@@ -165,13 +165,6 @@
 #define D_DATA_SIZE "Wielkość danych"
 #define D_ANALOG_INPUT "Wej_analogowe"
 
-#define D_FINGERPRINT "Weryfikuj odcisk TLS..."
-#define D_TLS_CONNECT_FAILED_TO "Nieudane połączenie TLS do"
-#define D_RETRY_IN "Spróbuj ponownie"
-#define D_VERIFIED "Zweryfikowano odcisku"
-#define D_INSECURE "Nieprawidłowe połączenie z powodu błędnego odcisku TLS"
-#define D_CONNECT_FAILED_TO "Nie udało się nawiązać połączenia"
-
 // support.ino
 #define D_OSWATCH "osWatch"
 #define D_BLOCKED_LOOP "Pętla zablokowana"
@@ -320,6 +313,14 @@
 #define D_ENABLE_WEBLOG_FOR_RESPONSE "Włącz poziom 2 zapisu Weblog, jeśli oczekiwana jest odpowiedź"
 #define D_NEED_USER_AND_PASSWORD "Wymagany użytkownik=<username>&hasło=<password>"
 
+// xdrv_00_mqtt.ino
+#define D_FINGERPRINT "Weryfikuj odcisk TLS..."
+#define D_TLS_CONNECT_FAILED_TO "Nieudane połączenie TLS do"
+#define D_RETRY_IN "Spróbuj ponownie"
+#define D_VERIFIED "Zweryfikowano odcisku"
+#define D_INSECURE "Nieprawidłowe połączenie z powodu błędnego odcisku TLS"
+#define D_CONNECT_FAILED_TO "Nie udało się nawiązać połączenia"
+
 // xdrv_wemohue.ino
 #define D_MULTICAST_DISABLED "Multicast jest wyłączony"
 #define D_MULTICAST_REJOINED "Multicast (re)dołączony"
@@ -351,9 +352,9 @@
   #define D_DOMOTICZ_TEMP_HUM_BARO "Temp,Wilg,Cis"
   #define D_DOMOTICZ_POWER_ENERGY "Moc,Energia"
   #define D_DOMOTICZ_ILLUMINANCE "Oświetl."
-  #define D_DOMOTICZ_COUNT "Licznik"
-  #define D_DOMOTICZ_VOLTAGE "Napięcie"
-  #define D_DOMOTICZ_CURRENT "Prąd"
+  #define D_DOMOTICZ_COUNT "Licznik/PM1"
+  #define D_DOMOTICZ_VOLTAGE "Napięcie/PM2,5"
+  #define D_DOMOTICZ_CURRENT "Prąd/PM10"
   #define D_DOMOTICZ_AIRQUALITY "AirQuality"
 #define D_DOMOTICZ_UPDATE_TIMER "Zaktualizuj czasomierz"
 
diff --git a/sonoff/language/pt-PT.h b/sonoff/language/pt-PT.h
index db42667f5..180d316d7 100644
--- a/sonoff/language/pt-PT.h
+++ b/sonoff/language/pt-PT.h
@@ -165,13 +165,6 @@
 #define D_DATA_SIZE "Tamanho de dados"
 #define D_ANALOG_INPUT "Entrada Analógica"
 
-#define D_FINGERPRINT "Verifique a impressão digital TLS..."
-#define D_TLS_CONNECT_FAILED_TO "TLS não conseguiu ligar"
-#define D_RETRY_IN "Tentativa em"
-#define D_VERIFIED "Verificado impressão digital "
-#define D_INSECURE "Ligação insegura devido à impressão digital inválida"
-#define D_CONNECT_FAILED_TO "A ligação falhou ao"
-
 // support.ino
 #define D_OSWATCH "osWatch"
 #define D_BLOCKED_LOOP "Loop Bloqueado"
@@ -320,6 +313,14 @@
 #define D_ENABLE_WEBLOG_FOR_RESPONSE "Habilitar weblog 2 se resposta esperada"
 #define D_NEED_USER_AND_PASSWORD "Necessário user=<nome utilizador>&password=<palavra chave>"
 
+// xdrv_00_mqtt.ino
+#define D_FINGERPRINT "Verifique a impressão digital TLS..."
+#define D_TLS_CONNECT_FAILED_TO "TLS não conseguiu ligar"
+#define D_RETRY_IN "Tentativa em"
+#define D_VERIFIED "Verificado impressão digital "
+#define D_INSECURE "Ligação insegura devido à impressão digital inválida"
+#define D_CONNECT_FAILED_TO "A ligação falhou ao"
+
 // xdrv_wemohue.ino
 #define D_MULTICAST_DISABLED "Multicast desabilitado"
 #define D_MULTICAST_REJOINED "Multicast (re)ingressou"
@@ -351,9 +352,9 @@
   #define D_DOMOTICZ_TEMP_HUM_BARO "Temp,Hum,Baro"
   #define D_DOMOTICZ_POWER_ENERGY "Potência,Energia"
   #define D_DOMOTICZ_ILLUMINANCE "Luminâcia"
-  #define D_DOMOTICZ_COUNT "Contagem"
-  #define D_DOMOTICZ_VOLTAGE "Voltagem"
-  #define D_DOMOTICZ_CURRENT "Corrente"
+  #define D_DOMOTICZ_COUNT "Contagem/PM1"
+  #define D_DOMOTICZ_VOLTAGE "Voltagem/PM2.5"
+  #define D_DOMOTICZ_CURRENT "Corrente/PM10"
   #define D_DOMOTICZ_AIRQUALITY "Qualidade do Ar"
 #define D_DOMOTICZ_UPDATE_TIMER "Tempo de atualização"
 
diff --git a/sonoff/language/ru-RU.h b/sonoff/language/ru-RU.h
index 1b60f0e4a..d2626ae5f 100644
--- a/sonoff/language/ru-RU.h
+++ b/sonoff/language/ru-RU.h
@@ -165,13 +165,6 @@
 #define D_DATA_SIZE "Размер данных"
 #define D_ANALOG_INPUT "Аналоговый вход"
 
-#define D_FINGERPRINT "Проверка TLS Fingerprint..."
-#define D_TLS_CONNECT_FAILED_TO "Сбой подключения TLS к"
-#define D_RETRY_IN "Повторить"
-#define D_VERIFIED "Проверено Fingerprint"
-#define D_INSECURE "Небезопасное соединение, недействительный Fingerprint"
-#define D_CONNECT_FAILED_TO "Ошибка подключения к"
-
 // support.ino
 #define D_OSWATCH "osWatch"
 #define D_BLOCKED_LOOP "Блокирующий цикл"
@@ -320,6 +313,14 @@
 #define D_ENABLE_WEBLOG_FOR_RESPONSE "Включить Веб лог уровня 2 если ожидается ответ"
 #define D_NEED_USER_AND_PASSWORD "Ожидается user=<username>&password=<password>"
 
+// xdrv_00_mqtt.ino
+#define D_FINGERPRINT "Проверка TLS Fingerprint..."
+#define D_TLS_CONNECT_FAILED_TO "Сбой подключения TLS к"
+#define D_RETRY_IN "Повторить"
+#define D_VERIFIED "Проверено Fingerprint"
+#define D_INSECURE "Небезопасное соединение, недействительный Fingerprint"
+#define D_CONNECT_FAILED_TO "Ошибка подключения к"
+
 // xdrv_wemohue.ino
 #define D_MULTICAST_DISABLED "Multicast отключен"
 #define D_MULTICAST_REJOINED "Multicast (ре)соединился"
@@ -351,9 +352,9 @@
   #define D_DOMOTICZ_TEMP_HUM_BARO "Temp,Hum,Baro"
   #define D_DOMOTICZ_POWER_ENERGY "Power,Energy"
   #define D_DOMOTICZ_ILLUMINANCE "Illuminance"
-  #define D_DOMOTICZ_COUNT "Count"
-  #define D_DOMOTICZ_VOLTAGE "Voltage"
-  #define D_DOMOTICZ_CURRENT "Current"
+  #define D_DOMOTICZ_COUNT "Count/PM1"
+  #define D_DOMOTICZ_VOLTAGE "Voltage/PM2,5"
+  #define D_DOMOTICZ_CURRENT "Current/PM10"
   #define D_DOMOTICZ_AIRQUALITY "AirQuality"
 #define D_DOMOTICZ_UPDATE_TIMER "Update timer"
 
@@ -384,7 +385,6 @@
 #define D_PARTICALS_BEYOND "Particals"
 
 // sonoff_template.h
-// Max string length is 8 characters including suffixes
 #define D_SENSOR_NONE     "-нет-"
 #define D_SENSOR_DHT11    "DHT11"
 #define D_SENSOR_AM2301   "AM2301"
diff --git a/sonoff/language/zh-CN.h b/sonoff/language/zh-CN.h
index d52e648f9..eb0351508 100644
--- a/sonoff/language/zh-CN.h
+++ b/sonoff/language/zh-CN.h
@@ -165,13 +165,6 @@
 #define D_DATA_SIZE "数据大小:"
 #define D_ANALOG_INPUT "Analog"
 
-#define D_FINGERPRINT "验证 TLS 指纹..."
-#define D_TLS_CONNECT_FAILED_TO "TLS 连接失败"
-#define D_RETRY_IN "重试倒计时:"
-#define D_VERIFIED "验证成功"
-#define D_INSECURE "指纹无效导致连接不安全"
-#define D_CONNECT_FAILED_TO "连接失败:"
-
 // support.ino
 #define D_OSWATCH "osWatch"
 #define D_BLOCKED_LOOP "Blocked Loop"
@@ -320,6 +313,14 @@
 #define D_ENABLE_WEBLOG_FOR_RESPONSE "如果预期响应，则启用Weblog 2"
 #define D_NEED_USER_AND_PASSWORD "需要 user=<用户名>&password=<密码>"
 
+// xdrv_00_mqtt.ino
+#define D_FINGERPRINT "验证 TLS 指纹..."
+#define D_TLS_CONNECT_FAILED_TO "TLS 连接失败"
+#define D_RETRY_IN "重试倒计时:"
+#define D_VERIFIED "验证成功"
+#define D_INSECURE "指纹无效导致连接不安全"
+#define D_CONNECT_FAILED_TO "连接失败:"
+
 // xdrv_wemohue.ino
 #define D_MULTICAST_DISABLED "组播已禁用"
 #define D_MULTICAST_REJOINED "组播已(重新)加入"
@@ -351,9 +352,9 @@
   #define D_DOMOTICZ_TEMP_HUM_BARO "温度,湿度,气压"
   #define D_DOMOTICZ_POWER_ENERGY "功率,电量"
   #define D_DOMOTICZ_ILLUMINANCE "照度"
-  #define D_DOMOTICZ_COUNT "数值"
-  #define D_DOMOTICZ_VOLTAGE "电压"
-  #define D_DOMOTICZ_CURRENT "电流"
+  #define D_DOMOTICZ_COUNT "数值/PM1"
+  #define D_DOMOTICZ_VOLTAGE "电压/PM2.5"
+  #define D_DOMOTICZ_CURRENT "电流/PM10"
   #define D_DOMOTICZ_AIRQUALITY "空气质量"
 #define D_DOMOTICZ_UPDATE_TIMER "更新计时器"
 
diff --git a/sonoff/language/zh-TW.h b/sonoff/language/zh-TW.h
index e011dfe3c..cab33a14b 100644
--- a/sonoff/language/zh-TW.h
+++ b/sonoff/language/zh-TW.h
@@ -165,13 +165,6 @@
 #define D_DATA_SIZE "數據大小:"
 #define D_ANALOG_INPUT "Analog"
 
-#define D_FINGERPRINT "驗證 TLS 指紋..."
-#define D_TLS_CONNECT_FAILED_TO "TLS 連接失敗"
-#define D_RETRY_IN "重試倒計時:"
-#define D_VERIFIED "驗證成功"
-#define D_INSECURE "指紋無效導致連接不安全"
-#define D_CONNECT_FAILED_TO "連接失敗:"
-
 // support.ino
 #define D_OSWATCH "osWatch"
 #define D_BLOCKED_LOOP "Blocked Loop"
@@ -320,6 +313,14 @@
 #define D_ENABLE_WEBLOG_FOR_RESPONSE "如果預期響應，則啟用Weblog 2"
 #define D_NEED_USER_AND_PASSWORD "需要 user=<用戶名>&password=<密碼>"
 
+// xdrv_00_mqtt.ino
+#define D_FINGERPRINT "驗證 TLS 指紋..."
+#define D_TLS_CONNECT_FAILED_TO "TLS 連接失敗"
+#define D_RETRY_IN "重試倒計時:"
+#define D_VERIFIED "驗證成功"
+#define D_INSECURE "指紋無效導致連接不安全"
+#define D_CONNECT_FAILED_TO "連接失敗:"
+
 // xdrv_wemohue.ino
 #define D_MULTICAST_DISABLED "組播已禁用"
 #define D_MULTICAST_REJOINED "組播已(重新)加入"
@@ -351,9 +352,9 @@
   #define D_DOMOTICZ_TEMP_HUM_BARO "溫度,濕度,氣壓"
   #define D_DOMOTICZ_POWER_ENERGY "功率,電量"
   #define D_DOMOTICZ_ILLUMINANCE "照度"
-  #define D_DOMOTICZ_COUNT "數值"
-  #define D_DOMOTICZ_VOLTAGE "電壓"
-  #define D_DOMOTICZ_CURRENT "電流"
+  #define D_DOMOTICZ_COUNT "數值/PM1"
+  #define D_DOMOTICZ_VOLTAGE "電壓/PM2.5"
+  #define D_DOMOTICZ_CURRENT "電流/PM10"
   #define D_DOMOTICZ_AIRQUALITY "空氣品質"
 #define D_DOMOTICZ_UPDATE_TIMER "更新計時器"
 
diff --git a/sonoff/xsns_18_pms5003.ino b/sonoff/xsns_18_pms5003.ino
index 217b63674..18b26263e 100644
--- a/sonoff/xsns_18_pms5003.ino
+++ b/sonoff/xsns_18_pms5003.ino
@@ -130,6 +130,11 @@ void PmsShow(boolean json)
         pms_data.pm10_standard, pms_data.pm25_standard, pms_data.pm100_standard,
         pms_data.pm10_env, pms_data.pm25_env, pms_data.pm100_env,
         pms_data.particles_03um, pms_data.particles_05um, pms_data.particles_10um, pms_data.particles_25um, pms_data.particles_50um, pms_data.particles_100um);
+#ifdef USE_DOMOTICZ
+      DomoticzSensor(DZ_COUNT, pms_data.pm10_env);     // PM1
+      DomoticzSensor(DZ_VOLTAGE, pms_data.pm25_env);   // PM2.5
+      DomoticzSensor(DZ_CURRENT, pms_data.pm100_env);  // PM10
+#endif  // USE_DOMOTICZ
 #ifdef USE_WEBSERVER
     } else {
       snprintf_P(mqtt_data, sizeof(mqtt_data), HTTP_PMS5003_SNS, mqtt_data,
diff --git a/sonoff/xsns_20_novasds.ino b/sonoff/xsns_20_novasds.ino
index 56d896c5e..8f6b591da 100644
--- a/sonoff/xsns_20_novasds.ino
+++ b/sonoff/xsns_20_novasds.ino
@@ -107,6 +107,10 @@ void NovaSdsShow(boolean json)
     dtostrfd(pm2_5f, 1, pm2_5);
     if (json) {
       snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,\"SDS0X1\":{\"PM2.5\":%s,\"PM10\":%s}"), mqtt_data, pm2_5, pm10);
+#ifdef USE_DOMOTICZ
+      DomoticzSensor(DZ_VOLTAGE, pm2_5);  // PM2.5
+      DomoticzSensor(DZ_CURRENT, pm10);   // PM10
+#endif  // USE_DOMOTICZ
 #ifdef USE_WEBSERVER
     } else {
       snprintf_P(mqtt_data, sizeof(mqtt_data), HTTP_SDS0X1_SNS, mqtt_data, pm2_5, pm10);