From ed1b0c82897b5395a35f352d75404ab86bdbdb5b Mon Sep 17 00:00:00 2001
From: piepluquad <piepluquad@gmail.com>
Date: Mon, 21 Aug 2017 05:56:09 +0200
Subject: [PATCH 1/2] fix typo for #597

---
 tabs/configuration.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tabs/configuration.html b/tabs/configuration.html
index 7db18d22..7aff3f8f 100644
--- a/tabs/configuration.html
+++ b/tabs/configuration.html
@@ -186,7 +186,7 @@
                                         </div>
                                         <label for="disarmkillswitch"> <span class="freelabel"
                                             i18n="configurationDisarmKillSwitch"></span>
-						 <div class="helpicon cf_tip" i18n_title="cconfigurationDisarmKillSwitcHelp"></div>
+                                            <div class="helpicon cf_tip" i18n_title="configurationDisarmKillSwitchHelp"></div>
                                         </label>
                                     </div>
                                     <div class="number disarmdelay" style="display: none; margin-bottom: 5px;">

From adb9aae5bf31f4fee7eb601183c20be956f66374 Mon Sep 17 00:00:00 2001
From: piepluquad <piepluquad@gmail.com>
Date: Mon, 21 Aug 2017 06:24:03 +0200
Subject: [PATCH 2/2] Channel MAP letters are confusing (fixes #625)

---
 _locales/en/messages.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 61934c13..003277a2 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -1823,16 +1823,16 @@
         "message": "Indicator (uses position on matrix)"
     },
     "controlAxisRoll": {
-        "message": "Roll"
+        "message": "Roll[A]"
     },
     "controlAxisPitch": {
-        "message": "Pitch"
+        "message": "Pitch[E]"
     },
     "controlAxisYaw": {
-        "message": "Yaw"
+        "message": "Yaw[R]"
     },
     "controlAxisThrottle": {
-        "message": "Throttle"
+        "message": "Throttle[T]"
     },
     "controlAxisAux1": {
         "message": "AUX 1"