From e68a6fd07895eb362cae99141190dc3c082a838a Mon Sep 17 00:00:00 2001
From: SteWers <42718143+SteWers@users.noreply.github.com>
Date: Sat, 13 Jan 2024 10:00:39 +0100
Subject: [PATCH] Add `D_BATTERY` (#20478)
Add `D_BATTERY` to language files
---
tasmota/language/af_AF.h | 1 +
tasmota/language/bg_BG.h | 1 +
tasmota/language/ca_AD.h | 1 +
tasmota/language/cs_CZ.h | 1 +
tasmota/language/de_DE.h | 3 ++-
tasmota/language/el_GR.h | 1 +
tasmota/language/en_GB.h | 1 +
tasmota/language/es_ES.h | 1 +
tasmota/language/fr_FR.h | 1 +
tasmota/language/fy_NL.h | 1 +
tasmota/language/he_HE.h | 1 +
tasmota/language/hu_HU.h | 1 +
tasmota/language/it_IT.h | 1 +
tasmota/language/ko_KO.h | 1 +
tasmota/language/nl_NL.h | 1 +
tasmota/language/pl_PL.h | 1 +
tasmota/language/pt_BR.h | 1 +
tasmota/language/pt_PT.h | 1 +
tasmota/language/ro_RO.h | 1 +
tasmota/language/ru_RU.h | 1 +
tasmota/language/sk_SK.h | 1 +
tasmota/language/sv_SE.h | 1 +
tasmota/language/tr_TR.h | 1 +
tasmota/language/uk_UA.h | 1 +
tasmota/language/vi_VN.h | 1 +
tasmota/language/zh_CN.h | 1 +
tasmota/language/zh_TW.h | 1 +
tasmota/tasmota_xsns_sensor/xsns_61_MI_NRF24.ino | 2 +-
tasmota/tasmota_xsns_sensor/xsns_62_MI_HM10.ino | 2 +-
tasmota/tasmota_xsns_sensor/xsns_62_esp32_mi.ino | 2 +-
tasmota/tasmota_xsns_sensor/xsns_62_esp32_mi_ble.ino | 3 ---
31 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/tasmota/language/af_AF.h b/tasmota/language/af_AF.h
index 7224bd8db..94dde999d 100644
--- a/tasmota/language/af_AF.h
+++ b/tasmota/language/af_AF.h
@@ -57,6 +57,7 @@
#define D_AP "AP" // Access Point
#define D_AS "as"
#define D_AUTO "AUTO"
+#define D_BATTERY "Battery"
#define D_BATT "Batt" // Short for Battery
#define D_BATTERY_CHARGE "Lading" // Battery charge in %
#define D_BLINK "Flits"
diff --git a/tasmota/language/bg_BG.h b/tasmota/language/bg_BG.h
index 54e5b9e52..03a62678e 100644
--- a/tasmota/language/bg_BG.h
+++ b/tasmota/language/bg_BG.h
@@ -57,6 +57,7 @@
#define D_AP "Точка за достъп" // Access Point
#define D_AS "като"
#define D_AUTO "АВТОМАТИЧНО"
+#define D_BATTERY "Battery"
#define D_BATT "Бат." // Short for Battery
#define D_BATTERY_CHARGE "Charge" // Battery charge in %
#define D_BLINK "Мигане вкл."
diff --git a/tasmota/language/ca_AD.h b/tasmota/language/ca_AD.h
index 086e9c732..cc50a3eec 100644
--- a/tasmota/language/ca_AD.h
+++ b/tasmota/language/ca_AD.h
@@ -57,6 +57,7 @@
#define D_AP "PA" // Access Point
#define D_AS "com"
#define D_AUTO "AUTO"
+#define D_BATTERY "Battery"
#define D_BATT "Bat" // Short for Battery
#define D_BATTERY_CHARGE "Charge" // Battery charge in %
#define D_BLINK "Espurna"
diff --git a/tasmota/language/cs_CZ.h b/tasmota/language/cs_CZ.h
index 1de0dea2a..0ec5c815a 100644
--- a/tasmota/language/cs_CZ.h
+++ b/tasmota/language/cs_CZ.h
@@ -57,6 +57,7 @@
#define D_AP "AP" // Access Point
#define D_AS "jako"
#define D_AUTO "AUTO"
+#define D_BATTERY "Battery"
#define D_BATT "Batt" // Short for Battery
#define D_BATTERY_CHARGE "Charge" // Battery charge in %
#define D_BLINK "Blikání"
diff --git a/tasmota/language/de_DE.h b/tasmota/language/de_DE.h
index 8c5c5e0f6..2ca6a99c6 100644
--- a/tasmota/language/de_DE.h
+++ b/tasmota/language/de_DE.h
@@ -28,7 +28,7 @@
* Use online command StateText to translate ON, OFF, HOLD and TOGGLE.
* Use online command Prefix to translate cmnd, stat and tele.
*
- * Updated until v13.3.0.1 - Last update 18.12.2023
+ * Updated until v13.3.0.3 - Last update 12.01.2024
\*********************************************************************/
//#define LANGUAGE_MODULE_NAME // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English)
@@ -57,6 +57,7 @@
#define D_AP "AP" // Access Point
#define D_AS "als"
#define D_AUTO "AUTO"
+#define D_BATTERY "Batterie"
#define D_BATT "Batt" // Short for Battery
#define D_BATTERY_CHARGE "Ladung" // Battery charge in %
#define D_BLINK "Blinken"
diff --git a/tasmota/language/el_GR.h b/tasmota/language/el_GR.h
index ca6c28fd9..e75f90599 100644
--- a/tasmota/language/el_GR.h
+++ b/tasmota/language/el_GR.h
@@ -57,6 +57,7 @@
#define D_AP "AP" // Access Point
#define D_AS "ως"
#define D_AUTO "ΑΥΤΟΜΑΤΟ"
+#define D_BATTERY "Battery"
#define D_BATT "Batt" // Short for Battery
#define D_BATTERY_CHARGE "Charge" // Battery charge in %
#define D_BLINK "Blink"
diff --git a/tasmota/language/en_GB.h b/tasmota/language/en_GB.h
index 720f1f169..f7b69de42 100644
--- a/tasmota/language/en_GB.h
+++ b/tasmota/language/en_GB.h
@@ -57,6 +57,7 @@
#define D_AP "AP" // Access Point
#define D_AS "as"
#define D_AUTO "AUTO"
+#define D_BATTERY "Battery"
#define D_BATT "Batt" // Short for Battery
#define D_BATTERY_CHARGE "Charge" // Battery charge in %
#define D_BLINK "Blink"
diff --git a/tasmota/language/es_ES.h b/tasmota/language/es_ES.h
index bc8e5728f..02f02e6cf 100644
--- a/tasmota/language/es_ES.h
+++ b/tasmota/language/es_ES.h
@@ -57,6 +57,7 @@
#define D_AP "AP" // Access Point
#define D_AS "como"
#define D_AUTO "AUTO"
+#define D_BATTERY "Battery"
#define D_BATT "Bat" // Short for Battery
#define D_BATTERY_CHARGE "Charge" // Battery charge in %
#define D_BLINK "Blink"
diff --git a/tasmota/language/fr_FR.h b/tasmota/language/fr_FR.h
index 1c3fe23fe..fa46c2866 100644
--- a/tasmota/language/fr_FR.h
+++ b/tasmota/language/fr_FR.h
@@ -57,6 +57,7 @@
#define D_AP "AP" // Access Point
#define D_AS "comme"
#define D_AUTO "AUTO"
+#define D_BATTERY "Battery"
#define D_BATT "Batt" // Short for Battery
#define D_BATTERY_CHARGE "Charge" // Battery charge in %
#define D_BLINK "Blink" // Not better in french
diff --git a/tasmota/language/fy_NL.h b/tasmota/language/fy_NL.h
index 917fa9704..702ca0f03 100644
--- a/tasmota/language/fy_NL.h
+++ b/tasmota/language/fy_NL.h
@@ -57,6 +57,7 @@
#define D_AP "AP" // Access Point
#define D_AS "als"
#define D_AUTO "AUTO"
+#define D_BATTERY "Battery"
#define D_BATT "Batt" // Short for Battery
#define D_BATTERY_CHARGE "Lading" // Battery charge in %
#define D_BLINK "Blinkje"
diff --git a/tasmota/language/he_HE.h b/tasmota/language/he_HE.h
index 978149adc..0a6c1124e 100644
--- a/tasmota/language/he_HE.h
+++ b/tasmota/language/he_HE.h
@@ -57,6 +57,7 @@
#define D_AP "AP" // Access Point
#define D_AS "-כ"
#define D_AUTO "אוטומטי"
+#define D_BATTERY "Battery"
#define D_BATT "Batt" // Short for Battery
#define D_BATTERY_CHARGE "Charge" // Battery charge in %
#define D_BLINK "מהבהב"
diff --git a/tasmota/language/hu_HU.h b/tasmota/language/hu_HU.h
index 58fd37d0d..50d0195bc 100644
--- a/tasmota/language/hu_HU.h
+++ b/tasmota/language/hu_HU.h
@@ -57,6 +57,7 @@
#define D_AP "AP" // Access Point
#define D_AS "mint"
#define D_AUTO "AUTO"
+#define D_BATTERY "Battery"
#define D_BATT "Batt" // Short for Battery
#define D_BATTERY_CHARGE "Charge" // Battery charge in %
#define D_BLINK "Villogás"
diff --git a/tasmota/language/it_IT.h b/tasmota/language/it_IT.h
index 75a216e10..602782c8a 100644
--- a/tasmota/language/it_IT.h
+++ b/tasmota/language/it_IT.h
@@ -57,6 +57,7 @@
#define D_AP "AP" // Access Point
#define D_AS "come"
#define D_AUTO "AUTO"
+#define D_BATTERY "Battery"
#define D_BATT "Batt" // Short for Battery
#define D_BATTERY_CHARGE "Carica" // Battery charge in %
#define D_BLINK "Lampeggia"
diff --git a/tasmota/language/ko_KO.h b/tasmota/language/ko_KO.h
index c02ce1fc1..0cdda28dc 100644
--- a/tasmota/language/ko_KO.h
+++ b/tasmota/language/ko_KO.h
@@ -57,6 +57,7 @@
#define D_AP "AP" // Access Point
#define D_AS "as"
#define D_AUTO "자동"
+#define D_BATTERY "Battery"
#define D_BATT "Batt" // Short for Battery
#define D_BATTERY_CHARGE "Charge" // Battery charge in %
#define D_BLINK "깜박임"
diff --git a/tasmota/language/nl_NL.h b/tasmota/language/nl_NL.h
index a5dbe04aa..de431c6cb 100644
--- a/tasmota/language/nl_NL.h
+++ b/tasmota/language/nl_NL.h
@@ -57,6 +57,7 @@
#define D_AP "AP" // Access Point
#define D_AS "als"
#define D_AUTO "AUTO"
+#define D_BATTERY "Battery"
#define D_BATT "Batt" // Short for Battery
#define D_BATTERY_CHARGE "Lading" // Battery charge in %
#define D_BLINK "Knipper"
diff --git a/tasmota/language/pl_PL.h b/tasmota/language/pl_PL.h
index d890ab6ed..b6b9f1415 100644
--- a/tasmota/language/pl_PL.h
+++ b/tasmota/language/pl_PL.h
@@ -57,6 +57,7 @@
#define D_AP "AP" // Access Point
#define D_AS "jak"
#define D_AUTO "AUTO"
+#define D_BATTERY "Battery"
#define D_BATT "Batt" // Short for Battery
#define D_BATTERY_CHARGE "Charge" // Battery charge in %
#define D_BLINK "Miganie"
diff --git a/tasmota/language/pt_BR.h b/tasmota/language/pt_BR.h
index 75b176504..6f18f4a03 100644
--- a/tasmota/language/pt_BR.h
+++ b/tasmota/language/pt_BR.h
@@ -57,6 +57,7 @@
#define D_AP "Ponto de acesso" // Ponto de Acesso
#define D_AS "como"
#define D_AUTO "Auto"
+#define D_BATTERY "Battery"
#define D_BATT "Bat" // Short for Battery
#define D_BATTERY_CHARGE "Charge" // Battery charge in %
#define D_BLINK "Piscar"
diff --git a/tasmota/language/pt_PT.h b/tasmota/language/pt_PT.h
index 6f06e7222..66dff8468 100644
--- a/tasmota/language/pt_PT.h
+++ b/tasmota/language/pt_PT.h
@@ -57,6 +57,7 @@
#define D_AP "AP" // Ponto de Acesso
#define D_AS "como"
#define D_AUTO "AUTO"
+#define D_BATTERY "Battery"
#define D_BATT "Batt" // Short for Battery
#define D_BATTERY_CHARGE "Charge" // Battery charge in %
#define D_BLINK "Piscar"
diff --git a/tasmota/language/ro_RO.h b/tasmota/language/ro_RO.h
index 344fe3efe..01abbb59f 100644
--- a/tasmota/language/ro_RO.h
+++ b/tasmota/language/ro_RO.h
@@ -57,6 +57,7 @@
#define D_AP "AP" // Access Point
#define D_AS "as"
#define D_AUTO "AUTO"
+#define D_BATTERY "Battery"
#define D_BATT "Batt" // Short for Battery
#define D_BATTERY_CHARGE "Charge" // Battery charge in %
#define D_BLINK "Blink"
diff --git a/tasmota/language/ru_RU.h b/tasmota/language/ru_RU.h
index 5291fe748..737939754 100644
--- a/tasmota/language/ru_RU.h
+++ b/tasmota/language/ru_RU.h
@@ -58,6 +58,7 @@
#define D_AP "AP" // Access Point
#define D_AS "как"
#define D_AUTO "АВТО"
+#define D_BATTERY "Battery"
#define D_BATT "Batt" // Short for Battery
#define D_BATTERY_CHARGE "Charge" // Battery charge in %
#define D_BLINK "Мигать"
diff --git a/tasmota/language/sk_SK.h b/tasmota/language/sk_SK.h
index 9bd615000..bc996bdba 100644
--- a/tasmota/language/sk_SK.h
+++ b/tasmota/language/sk_SK.h
@@ -57,6 +57,7 @@
#define D_AP "AP" // Access Point
#define D_AS "ako"
#define D_AUTO "AUTO"
+#define D_BATTERY "Battery"
#define D_BATT "Batt" // Short for Battery
#define D_BATTERY_CHARGE "Charge" // Battery charge in %
#define D_BLINK "Blikanie"
diff --git a/tasmota/language/sv_SE.h b/tasmota/language/sv_SE.h
index 9f64ab048..80cb7d9db 100644
--- a/tasmota/language/sv_SE.h
+++ b/tasmota/language/sv_SE.h
@@ -57,6 +57,7 @@
#define D_AP "AP" // Access Point
#define D_AS "som"
#define D_AUTO "AUTO"
+#define D_BATTERY "Battery"
#define D_BATT "Batt" // Short for Battery
#define D_BATTERY_CHARGE "Charge" // Battery charge in %
#define D_BLINK "Blinka"
diff --git a/tasmota/language/tr_TR.h b/tasmota/language/tr_TR.h
index 3fc97e797..642a4c236 100644
--- a/tasmota/language/tr_TR.h
+++ b/tasmota/language/tr_TR.h
@@ -57,6 +57,7 @@
#define D_AP "AP" // Access Point
#define D_AS "as"
#define D_AUTO "OTOMATIK"
+#define D_BATTERY "Battery"
#define D_BATT "Batt" // Short for Battery
#define D_BATTERY_CHARGE "Charge" // Battery charge in %
#define D_BLINK "Blink"
diff --git a/tasmota/language/uk_UA.h b/tasmota/language/uk_UA.h
index e5bcf184a..c54fc3e02 100644
--- a/tasmota/language/uk_UA.h
+++ b/tasmota/language/uk_UA.h
@@ -57,6 +57,7 @@
#define D_AP "Точка доступу" // Access Point
#define D_AS "як"
#define D_AUTO "АВТО"
+#define D_BATTERY "Battery"
#define D_BATT "Batt" // Short for Battery
#define D_BATTERY_CHARGE "Charge" // Battery charge in %
#define D_BLINK "Блимати"
diff --git a/tasmota/language/vi_VN.h b/tasmota/language/vi_VN.h
index ce42b275c..bf1518f35 100644
--- a/tasmota/language/vi_VN.h
+++ b/tasmota/language/vi_VN.h
@@ -57,6 +57,7 @@
#define D_AP "Mạng wifi" // Access Point
#define D_AS "với tên gọi"
#define D_AUTO "AUTO"
+#define D_BATTERY "Battery"
#define D_BATT "Batt" // Short for Battery
#define D_BATTERY_CHARGE "Charge" // Battery charge in %
#define D_BLINK "Blink"
diff --git a/tasmota/language/zh_CN.h b/tasmota/language/zh_CN.h
index 54ebf9e0e..3e881da35 100644
--- a/tasmota/language/zh_CN.h
+++ b/tasmota/language/zh_CN.h
@@ -57,6 +57,7 @@
#define D_AP "AP" // Access Point
#define D_AS "名称:"
#define D_AUTO "自动"
+#define D_BATTERY "Battery"
#define D_BATT "Batt" // Short for Battery
#define D_BATTERY_CHARGE "Charge" // Battery charge in %
#define D_BLINK "闪烁"
diff --git a/tasmota/language/zh_TW.h b/tasmota/language/zh_TW.h
index ee54c65a4..7777b7177 100644
--- a/tasmota/language/zh_TW.h
+++ b/tasmota/language/zh_TW.h
@@ -57,6 +57,7 @@
#define D_AP "存取點" // Access Point
#define D_AS "名稱:"
#define D_AUTO "自動"
+#define D_BATTERY "Battery"
#define D_BATT "電池" // Short for Battery
#define D_BATTERY_CHARGE "Charge" // Battery charge in %
#define D_BLINK "閃爍"
diff --git a/tasmota/tasmota_xsns_sensor/xsns_61_MI_NRF24.ino b/tasmota/tasmota_xsns_sensor/xsns_61_MI_NRF24.ino
index e6e4b60ec..c9bbb8ed0 100644
--- a/tasmota/tasmota_xsns_sensor/xsns_61_MI_NRF24.ino
+++ b/tasmota/tasmota_xsns_sensor/xsns_61_MI_NRF24.ino
@@ -1676,7 +1676,7 @@ bool NRFCmd(void) {
* Presentation
\*********************************************************************************************/
-const char HTTP_BATTERY[] PROGMEM = "{s}%s" " Battery" "{m}%u%%{e}";
+const char HTTP_BATTERY[] PROGMEM = "{s}%s " D_BATTERY "{m}%u%%{e}";
const char HTTP_MINRF_MAC[] PROGMEM = "{s}%s %s{m}%02x:%02x:%02x:%02x:%02x:%02x%{e}";
const char HTTP_MINRF_FLORA_DATA[] PROGMEM = "{s}%s" " Fertility" "{m}%dus/cm{e}";
const char HTTP_MINRF_HL[] PROGMEM = "{s}
{m}
{e}";
diff --git a/tasmota/tasmota_xsns_sensor/xsns_62_MI_HM10.ino b/tasmota/tasmota_xsns_sensor/xsns_62_MI_HM10.ino
index 80609ff73..406f5ec4c 100644
--- a/tasmota/tasmota_xsns_sensor/xsns_62_MI_HM10.ino
+++ b/tasmota/tasmota_xsns_sensor/xsns_62_MI_HM10.ino
@@ -1952,7 +1952,7 @@ void CmndHM10Option(void){
const char HTTP_HM10[] PROGMEM = "{s}HM10 FW%u V0960{m}%u%s / %u{e}";
const char HTTP_HM10_MAC[] PROGMEM = "{s}%s %s{m}%s{e}";
-const char HTTP_BATTERY[] PROGMEM = "{s}%s" " Battery" "{m}%u%%{e}";
+const char HTTP_BATTERY[] PROGMEM = "{s}%s " D_BATTERY "{m}%u%%{e}";
const char HTTP_RSSI[] PROGMEM = "{s}%s " D_RSSI "{m}%d dBm{e}";
const char HTTP_HM10_FLORA_DATA[] PROGMEM = "{s}%s" " Fertility" "{m}%u us/cm{e}";
const char HTTP_HM10_HL[] PROGMEM = "{s}
{m}
{e}";
diff --git a/tasmota/tasmota_xsns_sensor/xsns_62_esp32_mi.ino b/tasmota/tasmota_xsns_sensor/xsns_62_esp32_mi.ino
index 4ca91f3b2..5acc0d1b5 100644
--- a/tasmota/tasmota_xsns_sensor/xsns_62_esp32_mi.ino
+++ b/tasmota/tasmota_xsns_sensor/xsns_62_esp32_mi.ino
@@ -2350,7 +2350,7 @@ void MI32HandleWebGUI(void){
const char HTTP_MI32[] PROGMEM = "{s}Mi ESP32 {m} %u devices{e}";
#ifndef USE_MI_EXT_GUI
-const char HTTP_BATTERY[] PROGMEM = "{s}%s" " Battery" "{m}%u %%{e}";
+const char HTTP_BATTERY[] PROGMEM = "{s}%s " D_BATTERY "{m}%u %%{e}";
const char HTTP_LASTBUTTON[] PROGMEM = "{s}%s Last Button{m}%u {e}";
const char HTTP_EVENTS[] PROGMEM = "{s}%s Events{m}%u {e}";
const char HTTP_NMT[] PROGMEM = "{s}%s No motion{m}> %u seconds{e}";
diff --git a/tasmota/tasmota_xsns_sensor/xsns_62_esp32_mi_ble.ino b/tasmota/tasmota_xsns_sensor/xsns_62_esp32_mi_ble.ino
index 3cda0633a..06c3e1092 100644
--- a/tasmota/tasmota_xsns_sensor/xsns_62_esp32_mi_ble.ino
+++ b/tasmota/tasmota_xsns_sensor/xsns_62_esp32_mi_ble.ino
@@ -74,9 +74,6 @@
*/
//#undef USE_MI_ESP32
-// Move to language files later
-#define D_BATTERY "Battery"
-
// for testing of BLE_ESP32, we remove xsns_62_MI_ESP32.ino completely, and instead add this modified xsns_52_ibeacon_BLE_ESP32.ino
#ifdef USE_BLE_ESP32