From 5fefa01556b06d26e2c85103668175ebbc13d9d7 Mon Sep 17 00:00:00 2001
From: piepluquad <piepluquad@gmail.com>
Date: Fri, 18 Aug 2017 20:55:17 +0200
Subject: [PATCH 1/2] fixes betaflight/betaflight-configurator#597

---
 _locales/en/messages.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 6dbb6b9e..475c09f9 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -683,7 +683,7 @@
         "message": "Disarm motors after set delay [seconds] (Requires MOTOR_STOP feature)"
     },
     "configurationDisarmKillSwitch": {
-        "message": "Disarm motors regardless of throttle value (When arming via AUX channel)"
+        "message": "Arm/Disarm motors regardless of throttle value when using AUX channel"
     },
     "configurationDigitalIdlePercent": {
         "message": "Motor Idle Throttle Value [percent]"

From e89d87b573cdeff822b5e641c7fd2f512419e404 Mon Sep 17 00:00:00 2001
From: piepluquad <piepluquad@gmail.com>
Date: Sun, 20 Aug 2017 07:59:12 +0200
Subject: [PATCH 2/2] clarify message for configurationDisarmKillSwitch (fixes
 betaflight/betaflight-configurator#597) second attemps

---
 _locales/en/messages.json | 5 ++++-
 tabs/configuration.html   | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 475c09f9..61934c13 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -683,7 +683,10 @@
         "message": "Disarm motors after set delay [seconds] (Requires MOTOR_STOP feature)"
     },
     "configurationDisarmKillSwitch": {
-        "message": "Arm/Disarm motors regardless of throttle value when using AUX channel"
+        "message": "Disarm motors regardless of throttle value (When ARM is configured in Modes tab via AUX channel)"
+    },
+    "configurationDisarmKillSwitchHelp": {
+        "message": "Arming is always disabled when the throttle is not low. Be careful as you could disarm accidentally with a switch while flying with this option active."
     },
     "configurationDigitalIdlePercent": {
         "message": "Motor Idle Throttle Value [percent]"
diff --git a/tabs/configuration.html b/tabs/configuration.html
index 05d7c6c6..7db18d22 100644
--- a/tabs/configuration.html
+++ b/tabs/configuration.html
@@ -186,6 +186,7 @@
                                         </div>
                                         <label for="disarmkillswitch"> <span class="freelabel"
                                             i18n="configurationDisarmKillSwitch"></span>
+						 <div class="helpicon cf_tip" i18n_title="cconfigurationDisarmKillSwitcHelp"></div>
                                         </label>
                                     </div>
                                     <div class="number disarmdelay" style="display: none; margin-bottom: 5px;">
@@ -697,4 +698,4 @@
             </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>