From 4584effbce672702e0cda3357bbea2de66e8bbee Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Tue, 21 Jul 2020 10:44:45 +0200
Subject: [PATCH] Change all timer references from ``Arm`` to ``Enable``

Change all timer references from ``Arm`` to ``Enable`` in GUI, ``Timer`` command and JSON message
---
 RELEASENOTES.md      | 4 +++-
 tasmota/CHANGELOG.md | 4 +++-
 tasmota/i18n.h       | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 5e5e3e549..59b1a263c 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -63,6 +63,7 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Change ESP32 USER GPIO template representation decreasing template message size
 - Change define USE_TASMOTA_SLAVE into USE_TASMOTA_CLIENT
 - Change commands ``SlaveSend`` and ``SlaveReset`` into ``ClientSend`` and ``ClientReset``
+- Change all timer references from ``Arm`` to ``Enable`` in GUI, ``Timer`` command and JSON message
 - Fix escape of non-JSON received serial data (#8329)
 - Fix exception or watchdog on rule re-entry (#8757)
 - Add command ``Rule0`` to change global rule parameters
@@ -71,7 +72,8 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Add command ``SetOption97 0/1`` to switch between Tuya serial speeds 9600 bps (0) or 115200 bps (1)
 - Add command ``SetOption98 0/1`` to provide rotary rule triggers (1) instead of controlling light (0)
 - Add command ``SetOption99 0/1`` to enable zero cross detection on PWM dimmer
-- Add command ``SetOption100 0/1`` to remove ``ZbReceived`` value from ``{"ZbReceived":{xxx:yyy}}`` JSON message
+- Add command ``SetOption100 0/1`` to remove Zigbee ``ZbReceived`` value from ``{"ZbReceived":{xxx:yyy}}`` JSON message
+- Add command ``SetOption101 0/1`` to add the Zigbee source endpoint as suffix to attributes, ex `Power3` instead of `Power` if sent from endpoint 3
 - Add command ``Module2`` to configure fallback module on fast reboot (#8464)
 - Add commands ``LedPwmOn 0..255``, ``LedPwmOff 0..255`` and ``LedPwmMode1 0/1`` to control led brightness by George (#8491)
 - Add ESP32 ethernet commands ``EthType 0/1``, ``EthAddress 0..31`` and ``EthClockMode 0..3``
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index 7dbad0a37..901dfb7e8 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -4,7 +4,9 @@
 
 - Remove Arduino ESP8266 Core support for versions before 2.7.1
 - Change to limited support of Arduino IDE as an increasing amount of features cannot be compiled with Arduino IDE
-- Add command ``SetOption100 0/1`` to remove ``ZbReceived`` value from ``{"ZbReceived":{xxx:yyy}}`` JSON message
+- Change all timer references from ``Arm`` to ``Enable`` in GUI, ``Timer`` command and JSON message
+- Add command ``SetOption100 0/1`` to remove Zigbee ``ZbReceived`` value from ``{"ZbReceived":{xxx:yyy}}`` JSON message
+- Add command ``SetOption101 0/1`` to add the Zigbee source endpoint as suffix to attributes, ex `Power3` instead of `Power` if sent from endpoint 3
 
 ### 8.3.1.6 20200617
 
diff --git a/tasmota/i18n.h b/tasmota/i18n.h
index fb5cbceb3..a91ede963 100644
--- a/tasmota/i18n.h
+++ b/tasmota/i18n.h
@@ -481,7 +481,7 @@
 
 // Commands xdrv_09_timers.ino
 #define D_CMND_TIMER "Timer"
-  #define D_JSON_TIMER_ARM "Arm"
+  #define D_JSON_TIMER_ARM "Enable"
   #define D_JSON_TIMER_MODE "Mode"
   #define D_JSON_TIMER_TIME "Time"
   #define D_JSON_TIMER_WINDOW "Window"