From 4e98cbb387d619a2e4d93a785acecc81b680111a Mon Sep 17 00:00:00 2001 From: eeak Date: Sat, 29 Oct 2022 16:09:09 +0300 Subject: [PATCH] moved D_CMND_xx to i18n.h --- tasmota/include/i18n.h | 4 ++++ tasmota/language/af_AF.h | 2 -- tasmota/language/bg_BG.h | 2 -- tasmota/language/ca_AD.h | 2 -- tasmota/language/cs_CZ.h | 2 -- tasmota/language/de_DE.h | 2 -- tasmota/language/el_GR.h | 2 -- tasmota/language/en_GB.h | 2 -- tasmota/language/es_ES.h | 2 -- tasmota/language/fr_FR.h | 2 -- tasmota/language/fy_NL.h | 2 -- tasmota/language/he_HE.h | 2 -- tasmota/language/hu_HU.h | 2 -- tasmota/language/it_IT.h | 2 -- tasmota/language/ko_KO.h | 2 -- tasmota/language/nl_NL.h | 2 -- tasmota/language/pl_PL.h | 2 -- tasmota/language/pt_BR.h | 2 -- tasmota/language/pt_PT.h | 2 -- tasmota/language/ro_RO.h | 2 -- tasmota/language/ru_RU.h | 2 -- tasmota/language/sk_SK.h | 2 -- tasmota/language/sv_SE.h | 2 -- tasmota/language/tr_TR.h | 2 -- tasmota/language/uk_UA.h | 2 -- tasmota/language/vi_VN.h | 2 -- tasmota/language/zh_CN.h | 2 -- tasmota/language/zh_TW.h | 2 -- 28 files changed, 4 insertions(+), 54 deletions(-) diff --git a/tasmota/include/i18n.h b/tasmota/include/i18n.h index 84c0a78a6..1c46f3df4 100644 --- a/tasmota/include/i18n.h +++ b/tasmota/include/i18n.h @@ -753,6 +753,10 @@ // Commands xdrv_60_shift595.ino - 74x595 family shift register driver #define D_CMND_SHIFT595_DEVICE_COUNT "Shift595DeviceCount" +// Commands xdrv_89_dali.ino +#define D_CMND_DALI_POWER "power" +#define D_CMND_DALI_DIMMER "dim" + // Commands xsns_02_analog.ino #define D_CMND_ADCPARAM "AdcParam" diff --git a/tasmota/language/af_AF.h b/tasmota/language/af_AF.h index 39dc3126b..53f836a14 100644 --- a/tasmota/language/af_AF.h +++ b/tasmota/language/af_AF.h @@ -515,8 +515,6 @@ #define D_SENSOR_DALI_RX "Dali RX" #define D_SENSOR_DALI_TX "Dali TX" #define D_CONFIGURE_DALI "Config DALI" -#define D_CMND_DALI_POWER "power" -#define D_CMND_DALI_DIMMER "dim" // xdrv_03_energy.ino #define D_ENERGY_TODAY "Energie Vandag" diff --git a/tasmota/language/bg_BG.h b/tasmota/language/bg_BG.h index 21ecbce73..784a15f90 100644 --- a/tasmota/language/bg_BG.h +++ b/tasmota/language/bg_BG.h @@ -515,8 +515,6 @@ #define D_SENSOR_DALI_RX "Dali RX" #define D_SENSOR_DALI_TX "Dali TX" #define D_CONFIGURE_DALI "Config DALI" -#define D_CMND_DALI_POWER "power" -#define D_CMND_DALI_DIMMER "dim" // xdrv_03_energy.ino #define D_ENERGY_TODAY "Консумация за днес" diff --git a/tasmota/language/ca_AD.h b/tasmota/language/ca_AD.h index 01cf177b1..c01ee0d66 100644 --- a/tasmota/language/ca_AD.h +++ b/tasmota/language/ca_AD.h @@ -515,8 +515,6 @@ #define D_SENSOR_DALI_RX "Dali RX" #define D_SENSOR_DALI_TX "Dali TX" #define D_CONFIGURE_DALI "Config DALI" -#define D_CMND_DALI_POWER "power" -#define D_CMND_DALI_DIMMER "dim" // xdrv_03_energy.ino #define D_ENERGY_TODAY "Energy Today" diff --git a/tasmota/language/cs_CZ.h b/tasmota/language/cs_CZ.h index f1fea69ec..eb3d4d797 100644 --- a/tasmota/language/cs_CZ.h +++ b/tasmota/language/cs_CZ.h @@ -515,8 +515,6 @@ #define D_SENSOR_DALI_RX "Dali RX" #define D_SENSOR_DALI_TX "Dali TX" #define D_CONFIGURE_DALI "Config DALI" -#define D_CMND_DALI_POWER "power" -#define D_CMND_DALI_DIMMER "dim" // xdrv_03_energy.ino #define D_ENERGY_TODAY "Spotřeba Dnes" diff --git a/tasmota/language/de_DE.h b/tasmota/language/de_DE.h index df8a827b1..d4ba67d4a 100644 --- a/tasmota/language/de_DE.h +++ b/tasmota/language/de_DE.h @@ -515,8 +515,6 @@ #define D_SENSOR_DALI_RX "Dali RX" #define D_SENSOR_DALI_TX "Dali TX" #define D_CONFIGURE_DALI "Config DALI" -#define D_CMND_DALI_POWER "power" -#define D_CMND_DALI_DIMMER "dim" // xdrv_03_energy.ino #define D_ENERGY_TODAY "Energie heute" diff --git a/tasmota/language/el_GR.h b/tasmota/language/el_GR.h index 0d7500450..a7e79adf7 100644 --- a/tasmota/language/el_GR.h +++ b/tasmota/language/el_GR.h @@ -515,8 +515,6 @@ #define D_SENSOR_DALI_RX "Dali RX" #define D_SENSOR_DALI_TX "Dali TX" #define D_CONFIGURE_DALI "Config DALI" -#define D_CMND_DALI_POWER "power" -#define D_CMND_DALI_DIMMER "dim" // xdrv_03_energy.ino #define D_ENERGY_TODAY "Ενέργεια σήμερα" diff --git a/tasmota/language/en_GB.h b/tasmota/language/en_GB.h index d59a97f01..392abdb0e 100644 --- a/tasmota/language/en_GB.h +++ b/tasmota/language/en_GB.h @@ -515,8 +515,6 @@ #define D_SENSOR_DALI_RX "Dali RX" #define D_SENSOR_DALI_TX "Dali TX" #define D_CONFIGURE_DALI "Config DALI" -#define D_CMND_DALI_POWER "power" -#define D_CMND_DALI_DIMMER "dim" // xdrv_03_energy.ino #define D_ENERGY_TODAY "Energy Today" diff --git a/tasmota/language/es_ES.h b/tasmota/language/es_ES.h index b75beec9a..62043d5c5 100644 --- a/tasmota/language/es_ES.h +++ b/tasmota/language/es_ES.h @@ -515,8 +515,6 @@ #define D_SENSOR_DALI_RX "Dali RX" #define D_SENSOR_DALI_TX "Dali TX" #define D_CONFIGURE_DALI "Config DALI" -#define D_CMND_DALI_POWER "power" -#define D_CMND_DALI_DIMMER "dim" // xdrv_03_energy.ino #define D_ENERGY_TODAY "Energía Hoy" diff --git a/tasmota/language/fr_FR.h b/tasmota/language/fr_FR.h index 5f3eac5a3..3a26c486f 100644 --- a/tasmota/language/fr_FR.h +++ b/tasmota/language/fr_FR.h @@ -515,8 +515,6 @@ #define D_SENSOR_DALI_RX "Dali RX" #define D_SENSOR_DALI_TX "Dali TX" #define D_CONFIGURE_DALI "Config DALI" -#define D_CMND_DALI_POWER "power" -#define D_CMND_DALI_DIMMER "dim" // xsns_03_energy.ino #define D_ENERGY_TODAY "Énergie aujourd'hui" diff --git a/tasmota/language/fy_NL.h b/tasmota/language/fy_NL.h index a5f22689a..4e2bb00a1 100644 --- a/tasmota/language/fy_NL.h +++ b/tasmota/language/fy_NL.h @@ -515,8 +515,6 @@ #define D_SENSOR_DALI_RX "Dali RX" #define D_SENSOR_DALI_TX "Dali TX" #define D_CONFIGURE_DALI "Config DALI" -#define D_CMND_DALI_POWER "power" -#define D_CMND_DALI_DIMMER "dim" // xdrv_03_energy.ino #define D_ENERGY_TODAY "Konsumpsje hjoed" diff --git a/tasmota/language/he_HE.h b/tasmota/language/he_HE.h index 31d969f78..afde4734d 100644 --- a/tasmota/language/he_HE.h +++ b/tasmota/language/he_HE.h @@ -515,8 +515,6 @@ #define D_SENSOR_DALI_RX "Dali RX" #define D_SENSOR_DALI_TX "Dali TX" #define D_CONFIGURE_DALI "Config DALI" -#define D_CMND_DALI_POWER "power" -#define D_CMND_DALI_DIMMER "dim" // xdrv_03_energy.ino #define D_ENERGY_TODAY "צריכה יומית" diff --git a/tasmota/language/hu_HU.h b/tasmota/language/hu_HU.h index c2204ea65..1d753de1b 100644 --- a/tasmota/language/hu_HU.h +++ b/tasmota/language/hu_HU.h @@ -515,8 +515,6 @@ #define D_SENSOR_DALI_RX "Dali RX" #define D_SENSOR_DALI_TX "Dali TX" #define D_CONFIGURE_DALI "Config DALI" -#define D_CMND_DALI_POWER "power" -#define D_CMND_DALI_DIMMER "dim" // xdrv_03_energy.ino #define D_ENERGY_TODAY "Mai energia" diff --git a/tasmota/language/it_IT.h b/tasmota/language/it_IT.h index 5db1e1220..15b933509 100644 --- a/tasmota/language/it_IT.h +++ b/tasmota/language/it_IT.h @@ -515,8 +515,6 @@ #define D_SENSOR_DALI_RX "Dali RX" #define D_SENSOR_DALI_TX "Dali TX" #define D_CONFIGURE_DALI "Config DALI" -#define D_CMND_DALI_POWER "power" -#define D_CMND_DALI_DIMMER "dim" // xdrv_03_energy.ino #define D_ENERGY_TODAY "Energia - oggi" diff --git a/tasmota/language/ko_KO.h b/tasmota/language/ko_KO.h index 7e85879cc..7fd6d1864 100644 --- a/tasmota/language/ko_KO.h +++ b/tasmota/language/ko_KO.h @@ -515,8 +515,6 @@ #define D_SENSOR_DALI_RX "Dali RX" #define D_SENSOR_DALI_TX "Dali TX" #define D_CONFIGURE_DALI "Config DALI" -#define D_CMND_DALI_POWER "power" -#define D_CMND_DALI_DIMMER "dim" // xdrv_03_energy.ino #define D_ENERGY_TODAY "금일 전력 사용량" diff --git a/tasmota/language/nl_NL.h b/tasmota/language/nl_NL.h index f2355a709..d0f96fe48 100644 --- a/tasmota/language/nl_NL.h +++ b/tasmota/language/nl_NL.h @@ -515,8 +515,6 @@ #define D_SENSOR_DALI_RX "Dali RX" #define D_SENSOR_DALI_TX "Dali TX" #define D_CONFIGURE_DALI "Config DALI" -#define D_CMND_DALI_POWER "power" -#define D_CMND_DALI_DIMMER "dim" // xdrv_03_energy.ino #define D_ENERGY_TODAY "Verbruik vandaag" diff --git a/tasmota/language/pl_PL.h b/tasmota/language/pl_PL.h index c523cec6f..a4237e480 100644 --- a/tasmota/language/pl_PL.h +++ b/tasmota/language/pl_PL.h @@ -515,8 +515,6 @@ #define D_SENSOR_DALI_RX "Dali RX" #define D_SENSOR_DALI_TX "Dali TX" #define D_CONFIGURE_DALI "Config DALI" -#define D_CMND_DALI_POWER "power" -#define D_CMND_DALI_DIMMER "dim" // xdrv_03_energy.ino #define D_ENERGY_TODAY "Energia dzisiaj" diff --git a/tasmota/language/pt_BR.h b/tasmota/language/pt_BR.h index b87b1a618..ed31fc1f9 100644 --- a/tasmota/language/pt_BR.h +++ b/tasmota/language/pt_BR.h @@ -515,8 +515,6 @@ #define D_SENSOR_DALI_RX "Dali RX" #define D_SENSOR_DALI_TX "Dali TX" #define D_CONFIGURE_DALI "Config DALI" -#define D_CMND_DALI_POWER "power" -#define D_CMND_DALI_DIMMER "dim" // xdrv_03_energy.ino #define D_ENERGY_TODAY "Consumo energético de hoje" diff --git a/tasmota/language/pt_PT.h b/tasmota/language/pt_PT.h index c050785fa..e1bde2d58 100644 --- a/tasmota/language/pt_PT.h +++ b/tasmota/language/pt_PT.h @@ -515,8 +515,6 @@ #define D_SENSOR_DALI_RX "Dali RX" #define D_SENSOR_DALI_TX "Dali TX" #define D_CONFIGURE_DALI "Config DALI" -#define D_CMND_DALI_POWER "power" -#define D_CMND_DALI_DIMMER "dim" // xdrv_03_energy.ino #define D_ENERGY_TODAY "Consumo energético de hoje" diff --git a/tasmota/language/ro_RO.h b/tasmota/language/ro_RO.h index 77ca813dc..b9db344a1 100644 --- a/tasmota/language/ro_RO.h +++ b/tasmota/language/ro_RO.h @@ -515,8 +515,6 @@ #define D_SENSOR_DALI_RX "Dali RX" #define D_SENSOR_DALI_TX "Dali TX" #define D_CONFIGURE_DALI "Config DALI" -#define D_CMND_DALI_POWER "power" -#define D_CMND_DALI_DIMMER "dim" // xdrv_03_energy.ino #define D_ENERGY_TODAY "Energia de Azi" diff --git a/tasmota/language/ru_RU.h b/tasmota/language/ru_RU.h index fd9c3a7ee..5e38b74f9 100644 --- a/tasmota/language/ru_RU.h +++ b/tasmota/language/ru_RU.h @@ -515,8 +515,6 @@ #define D_SENSOR_DALI_RX "Dali RX" #define D_SENSOR_DALI_TX "Dali TX" #define D_CONFIGURE_DALI "Конфигурация DALI" -#define D_CMND_DALI_POWER "power" -#define D_CMND_DALI_DIMMER "dim" // xdrv_03_energy.ino #define D_ENERGY_TODAY "Энергия Сегодня" diff --git a/tasmota/language/sk_SK.h b/tasmota/language/sk_SK.h index 8b1f107df..2565fd648 100644 --- a/tasmota/language/sk_SK.h +++ b/tasmota/language/sk_SK.h @@ -515,8 +515,6 @@ #define D_SENSOR_DALI_RX "Dali RX" #define D_SENSOR_DALI_TX "Dali TX" #define D_CONFIGURE_DALI "Config DALI" -#define D_CMND_DALI_POWER "power" -#define D_CMND_DALI_DIMMER "dim" // xdrv_03_energy.ino #define D_ENERGY_TODAY "Spotreba dnes" diff --git a/tasmota/language/sv_SE.h b/tasmota/language/sv_SE.h index a603635c3..6c85c366f 100644 --- a/tasmota/language/sv_SE.h +++ b/tasmota/language/sv_SE.h @@ -515,8 +515,6 @@ #define D_SENSOR_DALI_RX "Dali RX" #define D_SENSOR_DALI_TX "Dali TX" #define D_CONFIGURE_DALI "Config DALI" -#define D_CMND_DALI_POWER "power" -#define D_CMND_DALI_DIMMER "dim" // xdrv_03_energy.ino #define D_ENERGY_TODAY "Energi idag" diff --git a/tasmota/language/tr_TR.h b/tasmota/language/tr_TR.h index 4c6d46b49..a32bd177a 100644 --- a/tasmota/language/tr_TR.h +++ b/tasmota/language/tr_TR.h @@ -515,8 +515,6 @@ #define D_SENSOR_DALI_RX "Dali RX" #define D_SENSOR_DALI_TX "Dali TX" #define D_CONFIGURE_DALI "Config DALI" -#define D_CMND_DALI_POWER "power" -#define D_CMND_DALI_DIMMER "dim" // xdrv_03_energy.ino #define D_ENERGY_TODAY "Energy Today" diff --git a/tasmota/language/uk_UA.h b/tasmota/language/uk_UA.h index 1a6f34161..b786a6700 100644 --- a/tasmota/language/uk_UA.h +++ b/tasmota/language/uk_UA.h @@ -515,8 +515,6 @@ #define D_SENSOR_DALI_RX "Dali RX" #define D_SENSOR_DALI_TX "Dali TX" #define D_CONFIGURE_DALI "Config DALI" -#define D_CMND_DALI_POWER "power" -#define D_CMND_DALI_DIMMER "dim" // xdrv_03_energy.ino #define D_ENERGY_TODAY "Енергія Сьогодні" diff --git a/tasmota/language/vi_VN.h b/tasmota/language/vi_VN.h index 7416d1dae..c054ed967 100644 --- a/tasmota/language/vi_VN.h +++ b/tasmota/language/vi_VN.h @@ -515,8 +515,6 @@ #define D_SENSOR_DALI_RX "Dali RX" #define D_SENSOR_DALI_TX "Dali TX" #define D_CONFIGURE_DALI "Config DALI" -#define D_CMND_DALI_POWER "power" -#define D_CMND_DALI_DIMMER "dim" // xdrv_03_energy.ino #define D_ENERGY_TODAY "Năng lượng tiêu thụ hôm nay" diff --git a/tasmota/language/zh_CN.h b/tasmota/language/zh_CN.h index 4f93019fc..63d885088 100644 --- a/tasmota/language/zh_CN.h +++ b/tasmota/language/zh_CN.h @@ -515,8 +515,6 @@ #define D_SENSOR_DALI_RX "Dali RX" #define D_SENSOR_DALI_TX "Dali TX" #define D_CONFIGURE_DALI "Config DALI" -#define D_CMND_DALI_POWER "power" -#define D_CMND_DALI_DIMMER "dim" // xdrv_03_energy.ino #define D_ENERGY_TODAY "今日用电量" diff --git a/tasmota/language/zh_TW.h b/tasmota/language/zh_TW.h index 641f8192c..30db4a4f1 100644 --- a/tasmota/language/zh_TW.h +++ b/tasmota/language/zh_TW.h @@ -515,8 +515,6 @@ #define D_SENSOR_DALI_RX "Dali RX" #define D_SENSOR_DALI_TX "Dali TX" #define D_CONFIGURE_DALI "Config DALI" -#define D_CMND_DALI_POWER "power" -#define D_CMND_DALI_DIMMER "dim" // xdrv_03_energy.ino #define D_ENERGY_TODAY "今日用電量"