From 344074b05ba7b1d084330ed49c368c49cfc45384 Mon Sep 17 00:00:00 2001
From: Don Gagne <DonLakeFlyer@users.noreply.github.com>
Date: Fri, 29 May 2020 14:01:10 -0700
Subject: [PATCH] New translations qgc.ts (Hebrew)

---
 translations/qgc_he_IL.ts | 7882 ++++++++++++++++++++++---------------
 1 file changed, 4623 insertions(+), 3259 deletions(-)

diff --git a/translations/qgc_he_IL.ts b/translations/qgc_he_IL.ts
index fce06573bb..ab5763e5fd 100644
--- a/translations/qgc_he_IL.ts
+++ b/translations/qgc_he_IL.ts
@@ -1,45 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.1" language="he" sourcelanguage="en">
+  <context>
+    <name>ADSBVehicleManager</name>
+    <message>
+      <location filename="../src/ADSB/ADSBVehicleManager.cc" line="69"/>
+      <source>ADSB Server Error: %1</source>
+      <translation type="unfinished">ADSB Server Error: %1</translation>
+    </message>
+  </context>
   <context>
     <name>APMAirframeComponent</name>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="74"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="74"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="71"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="71"/>
       <source>Airframe is currently not set.</source>
       <translation type="unfinished">Airframe is currently not set.</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="75"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="75"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="72"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="72"/>
       <source>Currently set to frame class &apos;%1&apos;</source>
       <translation type="unfinished">Currently set to frame class &apos;%1&apos;</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="76"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="76"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="73"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="73"/>
       <source> and frame type &apos;%2&apos;</source>
       <translation type="unfinished"> and frame type &apos;%2&apos;</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="77"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="77"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="74"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="74"/>
       <source>.</source>
       <comment>period for end of sentence</comment>
       <translation type="unfinished">.</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="78"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="78"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="75"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="75"/>
       <source> To change this configuration, select the desired frame class below and frame type.</source>
       <translation type="unfinished"> To change this configuration, select the desired frame class below and frame type.</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="160"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="160"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="166"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="166"/>
       <source>Frame Type</source>
       <translation type="unfinished">Frame Type</translation>
     </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="209"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="209"/>
+      <source>Invalid setting for FRAME_TYPE. Click to Reset.</source>
+      <translation type="unfinished">Invalid setting for FRAME_TYPE. Click to Reset.</translation>
+    </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.cc" line="19"/>
       <source>Frame</source>
@@ -54,12 +68,12 @@
   <context>
     <name>APMAirframeComponentController</name>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentController.cc" line="256"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentController.cc" line="257"/>
       <source>Param file github json download failed: %1</source>
       <translation type="unfinished">Param file github json download failed: %1</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentController.cc" line="269"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentController.cc" line="270"/>
       <source>Param file download failed: %1</source>
       <translation type="unfinished">Param file download failed: %1</translation>
     </message>
@@ -67,26 +81,26 @@
   <context>
     <name>APMAirframeComponentSummary</name>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="29"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="29"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="23"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="23"/>
       <source>Frame Class</source>
       <translation type="unfinished">Frame Class</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="35"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="35"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="29"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="29"/>
       <source>Frame Type</source>
       <translation type="unfinished">Frame Type</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="41"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="41"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="35"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="35"/>
       <source>Firmware Version</source>
       <translation type="unfinished">Firmware Version</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="42"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="36"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="36"/>
       <source>Unknown</source>
       <translation type="unfinished">Unknown</translation>
     </message>
@@ -94,7 +108,7 @@
   <context>
     <name>APMAutoPilotPlugin</name>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAutoPilotPlugin.cc" line="204"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMAutoPilotPlugin.cc" line="221"/>
       <source>WARNING: The flight board you are using has a critical service bulletin against it which advises against flying. For details see: https://discuss.cubepilot.org/t/sb-0000002-critical-service-bulletin-for-cubes-purchased-between-january-2019-to-present-do-not-fly/406</source>
       <translation type="unfinished">WARNING: The flight board you are using has a critical service bulletin against it which advises against flying. For details see: https://discuss.cubepilot.org/t/sb-0000002-critical-service-bulletin-for-cubes-purchased-between-january-2019-to-present-do-not-fly/406</translation>
     </message>
@@ -138,78 +152,78 @@
       <translation type="unfinished">Output channel:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="285"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="285"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="286"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="286"/>
       <source>Input channel:</source>
       <translation type="unfinished">Input channel:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="305"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="305"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="306"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="306"/>
       <source>Gimbal angle limits:</source>
       <translation type="unfinished">Gimbal angle limits:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="314"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="358"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="314"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="358"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="315"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="359"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="315"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="359"/>
       <source>min</source>
       <translation type="unfinished">min</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="332"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="377"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="332"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="377"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="333"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="378"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="333"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="378"/>
       <source>max</source>
       <translation type="unfinished">max</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="350"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="350"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="351"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="351"/>
       <source>Servo PWM limits:</source>
       <translation type="unfinished">Servo PWM limits:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="405"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="405"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="406"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="406"/>
       <source>Gimbal Settings</source>
       <translation type="unfinished">Gimbal Settings</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="422"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="422"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="423"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="423"/>
       <source>Type:</source>
       <translation type="unfinished">Type:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="444"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="444"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="445"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="445"/>
       <source>Gimbal Type changes takes affect next reboot of autopilot</source>
       <translation type="unfinished">Gimbal Type changes takes affect next reboot of autopilot</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="452"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="452"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="453"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="453"/>
       <source>Default Mode:</source>
       <translation type="unfinished">Default Mode:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="472"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="472"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="473"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="473"/>
       <source>Tilt</source>
       <translation type="unfinished">Tilt</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="490"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="490"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="491"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="491"/>
       <source>Roll</source>
       <translation type="unfinished">Roll</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="508"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="508"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="509"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="509"/>
       <source>Pan</source>
       <translation type="unfinished">Pan</translation>
     </message>
@@ -332,84 +346,84 @@
       <translation type="unfinished">Output channel:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="339"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="339"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="340"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="340"/>
       <source>Servo reverse</source>
       <translation type="unfinished">Servo reverse</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="349"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="349"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="350"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="350"/>
       <source>Stabilize</source>
       <translation type="unfinished">Stabilize</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="367"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="367"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="368"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="368"/>
       <source>Servo PWM limits:</source>
       <translation type="unfinished">Servo PWM limits:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="373"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="408"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="373"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="408"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="374"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="409"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="374"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="409"/>
       <source>min</source>
       <translation type="unfinished">min</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="383"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="418"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="383"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="418"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="384"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="419"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="384"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="419"/>
       <source>max</source>
       <translation type="unfinished">max</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="403"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="403"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="404"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="404"/>
       <source>Gimbal angle limits:</source>
       <translation type="unfinished">Gimbal angle limits:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="444"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="444"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="445"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="445"/>
       <source>Gimbal Settings</source>
       <translation type="unfinished">Gimbal Settings</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="461"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="461"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="462"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="462"/>
       <source>Type:</source>
       <translation type="unfinished">Type:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="483"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="483"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="484"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="484"/>
       <source>Gimbal Type changes takes affect next reboot of autopilot</source>
       <translation type="unfinished">Gimbal Type changes takes affect next reboot of autopilot</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="491"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="491"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="492"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="492"/>
       <source>Default Mode:</source>
       <translation type="unfinished">Default Mode:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="512"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="512"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="513"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="513"/>
       <source>Tilt</source>
       <translation type="unfinished">Tilt</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="532"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="532"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="533"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="533"/>
       <source>Roll</source>
       <translation type="unfinished">Roll</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="552"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="552"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="553"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="553"/>
       <source>Pan</source>
       <translation type="unfinished">Pan</translation>
     </message>
@@ -417,56 +431,66 @@
   <context>
     <name>APMFirmwarePlugin</name>
     <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="391"/>
+      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="401"/>
       <source>QGroundControl fully supports Version %1.%2 and above. You are using a version prior to that. This combination is untested, you may run into unpredictable results.</source>
       <translation type="unfinished">QGroundControl fully supports Version %1.%2 and above. You are using a version prior to that. This combination is untested, you may run into unpredictable results.</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="809"/>
+      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="802"/>
       <source>Error during Solo video link setup: %1</source>
       <translation type="unfinished">Error during Solo video link setup: %1</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="907"/>
+      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="912"/>
       <source>Unable to change altitude, vehicle altitude not known.</source>
       <translation type="unfinished">Unable to change altitude, vehicle altitude not known.</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="962"/>
+      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="972"/>
       <source>Vehicle does not support guided takeoff</source>
       <translation type="unfinished">Vehicle does not support guided takeoff</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="968"/>
+      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="978"/>
       <source>Unable to takeoff, vehicle position not known.</source>
       <translation type="unfinished">Unable to takeoff, vehicle position not known.</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="978"/>
+      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="988"/>
       <source>Unable to takeoff: Vehicle failed to change to Guided mode.</source>
       <translation type="unfinished">Unable to takeoff: Vehicle failed to change to Guided mode.</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="983"/>
+      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="993"/>
       <source>Unable to takeoff: Vehicle failed to arm.</source>
       <translation type="unfinished">Unable to takeoff: Vehicle failed to arm.</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="1001"/>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="1021"/>
+      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="1011"/>
+      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="1031"/>
       <source>Unable to start mission: Vehicle failed to change to Auto mode.</source>
       <translation type="unfinished">Unable to start mission: Vehicle failed to change to Auto mode.</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="1009"/>
+      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="1019"/>
       <source>Unable to start mission: Vehicle failed to change to Guided mode.</source>
       <translation type="unfinished">Unable to start mission: Vehicle failed to change to Guided mode.</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="1014"/>
+      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="1024"/>
       <source>Unable to start mission: Vehicle failed to arm.</source>
       <translation type="unfinished">Unable to start mission: Vehicle failed to arm.</translation>
     </message>
+    <message>
+      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="1101"/>
+      <source>Follow failed: Home position not set.</source>
+      <translation type="unfinished">Follow failed: Home position not set.</translation>
+    </message>
+    <message>
+      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="1111"/>
+      <source>Follow failed: Ground station cannot provide required position information.</source>
+      <translation type="unfinished">Follow failed: Ground station cannot provide required position information.</translation>
+    </message>
   </context>
   <context>
     <name>APMFlightModesComponent</name>
@@ -592,22 +616,22 @@
   <context>
     <name>APMFlightModesComponentController</name>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentController.cc" line="37"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentController.cc" line="38"/>
       <source>Off</source>
       <translation type="unfinished">Off</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentController.cc" line="37"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentController.cc" line="38"/>
       <source>Simple</source>
       <translation type="unfinished">Simple</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentController.cc" line="37"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentController.cc" line="38"/>
       <source>Super-Simple</source>
       <translation type="unfinished">Super-Simple</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentController.cc" line="37"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentController.cc" line="38"/>
       <source>Custom</source>
       <translation type="unfinished">Custom</translation>
     </message>
@@ -615,127 +639,321 @@
   <context>
     <name>APMFlightModesComponentSummary</name>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="27"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="27"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="28"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="28"/>
       <source>Flight Mode 1</source>
       <translation type="unfinished">Flight Mode 1</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="32"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="32"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="33"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="33"/>
       <source>Flight Mode 2</source>
       <translation type="unfinished">Flight Mode 2</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="37"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="38"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="38"/>
       <source>Flight Mode 3</source>
       <translation type="unfinished">Flight Mode 3</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="42"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="43"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="43"/>
       <source>Flight Mode 4</source>
       <translation type="unfinished">Flight Mode 4</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="47"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="48"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="48"/>
       <source>Flight Mode 5</source>
       <translation type="unfinished">Flight Mode 5</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="52"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="52"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="53"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="53"/>
       <source>Flight Mode 6</source>
       <translation type="unfinished">Flight Mode 6</translation>
     </message>
   </context>
+  <context>
+    <name>APMFollowComponent</name>
+    <message>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="193"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="193"/>
+      <source>Enable Follow Me</source>
+      <translation type="unfinished">Enable Follow Me</translation>
+    </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="212"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="212"/>
+      <source>Waiting for Vehicle to update</source>
+      <translation type="unfinished">Waiting for Vehicle to update</translation>
+    </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="224"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="224"/>
+      <source>The vehicle parameters required for follow me are currently set in a way which is not supported. Using follow with this setup may lead to unpredictable/hazardous results.</source>
+      <translation type="unfinished">The vehicle parameters required for follow me are currently set in a way which is not supported. Using follow with this setup may lead to unpredictable/hazardous results.</translation>
+    </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="230"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="230"/>
+      <source>Reset To Supported Settings</source>
+      <translation type="unfinished">Reset To Supported Settings</translation>
+    </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="248"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="248"/>
+      <source>Vehicle Position</source>
+      <translation type="unfinished">Vehicle Position</translation>
+    </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="252"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="252"/>
+      <source>Maintain Current Offsets</source>
+      <translation type="unfinished">Maintain Current Offsets</translation>
+    </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="252"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="252"/>
+      <source>Specify Offsets</source>
+      <translation type="unfinished">Specify Offsets</translation>
+    </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="265"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="265"/>
+      <source>Point Vehicle</source>
+      <translation type="unfinished">Point Vehicle</translation>
+    </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="275"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="275"/>
+      <source>Maintain current vehicle orientation</source>
+      <translation type="unfinished">Maintain current vehicle orientation</translation>
+    </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="275"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="275"/>
+      <source>Point at ground station location</source>
+      <translation type="unfinished">Point at ground station location</translation>
+    </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="275"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="275"/>
+      <source>Same direction as ground station movement</source>
+      <translation type="unfinished">Same direction as ground station movement</translation>
+    </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="288"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="288"/>
+      <source>Vehicle Offsets</source>
+      <translation type="unfinished">Vehicle Offsets</translation>
+    </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="291"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="291"/>
+      <source>Angle</source>
+      <translation type="unfinished">Angle</translation>
+    </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="297"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="297"/>
+      <source>Distance</source>
+      <translation type="unfinished">Distance</translation>
+    </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="305"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="305"/>
+      <source>Height</source>
+      <translation type="unfinished">Height</translation>
+    </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="346"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="346"/>
+      <source>Click in the graphic to change angle</source>
+      <translation type="unfinished">Click in the graphic to change angle</translation>
+    </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="507"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="507"/>
+      <source>L</source>
+      <translation type="unfinished">L</translation>
+    </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.cc" line="17"/>
+      <source>Follow Me</source>
+      <translation type="unfinished">Follow Me</translation>
+    </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.cc" line="28"/>
+      <source>Follow Me Setup is used to configure support for the vehicle following the ground station location.</source>
+      <translation type="unfinished">Follow Me Setup is used to configure support for the vehicle following the ground station location.</translation>
+    </message>
+  </context>
+  <context>
+    <name>APMFollowComponentSummary</name>
+    <message>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="36"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="36"/>
+      <source>Batt1 monitor</source>
+      <translation type="unfinished">Batt1 monitor</translation>
+    </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="41"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="41"/>
+      <source>Batt1 capacity</source>
+      <translation type="unfinished">Batt1 capacity</translation>
+    </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="47"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="47"/>
+      <source>Batt2 monitor</source>
+      <translation type="unfinished">Batt2 monitor</translation>
+    </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="53"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="53"/>
+      <source>Batt2 capacity</source>
+      <translation type="unfinished">Batt2 capacity</translation>
+    </message>
+  </context>
   <context>
     <name>APMHeliComponent</name>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="71"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="71"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="79"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="79"/>
       <source>Servo Setup</source>
       <translation type="unfinished">Servo Setup</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="76"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="76"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="84"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="84"/>
       <source>Servo</source>
       <translation type="unfinished">Servo</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="77"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="77"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="85"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="85"/>
       <source>Function</source>
       <translation type="unfinished">Function</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="78"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="78"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="86"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="86"/>
       <source>Min</source>
       <translation type="unfinished">Min</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="79"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="79"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="87"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="87"/>
       <source>Max</source>
       <translation type="unfinished">Max</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="80"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="80"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="88"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="88"/>
       <source>Trim</source>
       <translation type="unfinished">Trim</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="81"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="81"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="89"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="89"/>
       <source>Reversed</source>
       <translation type="unfinished">Reversed</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="83"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="83"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="91"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="91"/>
       <source>1</source>
       <translation type="unfinished">1</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="106"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="106"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="114"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="114"/>
       <source>2</source>
       <translation type="unfinished">2</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="129"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="129"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="137"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="137"/>
       <source>3</source>
       <translation type="unfinished">3</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="152"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="152"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="160"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="160"/>
       <source>4</source>
       <translation type="unfinished">4</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="178"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="178"/>
-      <source>Swash Setup</source>
-      <translation type="unfinished">Swash Setup</translation>
+      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="183"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="183"/>
+      <source>5</source>
+      <translation type="unfinished">5</translation>
+    </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="206"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="206"/>
+      <source>6</source>
+      <translation type="unfinished">6</translation>
+    </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="229"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="229"/>
+      <source>7</source>
+      <translation type="unfinished">7</translation>
+    </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="252"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="252"/>
+      <source>8</source>
+      <translation type="unfinished">8</translation>
+    </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="278"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="278"/>
+      <source>Swashplate Setup</source>
+      <translation type="unfinished">Swashplate Setup</translation>
+    </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="328"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="328"/>
+      <source>Throttle Settings</source>
+      <translation type="unfinished">Throttle Settings</translation>
+    </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="372"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="372"/>
+      <source>Governor Settings</source>
+      <translation type="unfinished">Governor Settings</translation>
+    </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="395"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="395"/>
+      <source>Miscellaneous Settings</source>
+      <translation type="unfinished">Miscellaneous Settings</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="231"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="231"/>
-      <source>Throttle Setup</source>
-      <translation type="unfinished">Throttle Setup</translation>
+      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="400"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="400"/>
+      <source>* Stabilize Collective Curve *</source>
+      <translation type="unfinished">* Stabilize Collective Curve *</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="275"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="275"/>
-      <source>Collective Curve Setup</source>
-      <translation type="unfinished">Collective Curve Setup</translation>
+      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="401"/>
+      <source/>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="415"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="415"/>
+      <source>* Tail &amp; Gyros *</source>
+      <translation type="unfinished">* Tail &amp; Gyros *</translation>
+    </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="416"/>
+      <source/>
+      <translation type="unfinished"/>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.cc" line="15"/>
@@ -747,36 +965,46 @@
       <source>Heli Setup is used to setup parameters which are specific to a helicopter.</source>
       <translation type="unfinished">Heli Setup is used to setup parameters which are specific to a helicopter.</translation>
     </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="401"/>
+      <source/>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="416"/>
+      <source/>
+      <translation type="unfinished"/>
+    </message>
   </context>
   <context>
     <name>APMLightsComponent</name>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="137"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="137"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="135"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="135"/>
       <source>Disabled</source>
       <translation type="unfinished">Disabled</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="145"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="145"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="143"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="143"/>
       <source>Channel </source>
       <translation type="unfinished">Channel </translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="169"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="169"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="167"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="167"/>
       <source>Light Output Channels</source>
       <translation type="unfinished">Light Output Channels</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="186"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="186"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="184"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="184"/>
       <source>Lights 1:</source>
       <translation type="unfinished">Lights 1:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="206"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="206"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="205"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="205"/>
       <source>Lights 2:</source>
       <translation type="unfinished">Lights 2:</translation>
     </message>
@@ -881,10 +1109,40 @@
   <context>
     <name>APMMotorComponent</name>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.cc" line="14"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.cc" line="15"/>
       <source>Motors</source>
       <translation type="unfinished">Motors</translation>
     </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="39"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="39"/>
+      <source>Warning: Unable to determine motor count</source>
+      <translation type="unfinished">Warning: Unable to determine motor count</translation>
+    </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="96"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="96"/>
+      <source>All</source>
+      <translation type="unfinished">All</translation>
+    </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="122"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="122"/>
+      <source>Moving the sliders will causes the motors to spin. Make sure you remove all props.</source>
+      <translation type="unfinished">Moving the sliders will causes the motors to spin. Make sure you remove all props.</translation>
+    </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="142"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="142"/>
+      <source>Careful: Motor sliders are enabled</source>
+      <translation type="unfinished">Careful: Motor sliders are enabled</translation>
+    </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="142"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="142"/>
+      <source>Propellers are removed - Enable motor sliders</source>
+      <translation type="unfinished">Propellers are removed - Enable motor sliders</translation>
+    </message>
   </context>
   <context>
     <name>APMNotSupported</name>
@@ -919,253 +1177,271 @@
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="94"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="178"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="179"/>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="94"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="178"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="179"/>
       <source>Reboot vehicle</source>
       <translation type="unfinished">Reboot vehicle</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="144"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="193"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="144"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="193"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="145"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="194"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="145"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="194"/>
       <source>Battery 2</source>
       <translation type="unfinished">Battery 2</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="164"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="164"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="165"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="165"/>
       <source>Battery2 monitor:</source>
       <translation type="unfinished">Battery2 monitor:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="227"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="227"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="229"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="229"/>
       <source>ESC Calibration</source>
       <translation type="unfinished">ESC Calibration</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="246"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="246"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="248"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="248"/>
       <source>WARNING: Remove props prior to calibration!</source>
       <translation type="unfinished">WARNING: Remove props prior to calibration!</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="254"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="254"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="256"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="256"/>
       <source>Calibrate</source>
       <translation type="unfinished">Calibrate</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="261"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="261"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="263"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="263"/>
       <source>Now perform these steps:</source>
       <translation type="unfinished">Now perform these steps:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="261"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="261"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="263"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="263"/>
       <source>Click Calibrate to start, then:</source>
       <translation type="unfinished">Click Calibrate to start, then:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="262"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="262"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="264"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="264"/>
       <source>- Disconnect USB and battery so flight controller powers down</source>
       <translation type="unfinished">- Disconnect USB and battery so flight controller powers down</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="263"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="263"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="265"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="265"/>
       <source>- Connect the battery</source>
       <translation type="unfinished">- Connect the battery</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="264"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="264"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="266"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="266"/>
       <source>- The arming tone will be played (if the vehicle has a buzzer attached)</source>
       <translation type="unfinished">- The arming tone will be played (if the vehicle has a buzzer attached)</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="265"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="265"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="267"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="267"/>
       <source>- If using a flight controller with a safety button press it until it displays solid red</source>
       <translation type="unfinished">- If using a flight controller with a safety button press it until it displays solid red</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="266"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="266"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="268"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="268"/>
       <source>- You will hear a musical tone then two beeps</source>
       <translation type="unfinished">- You will hear a musical tone then two beeps</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="267"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="267"/>
-      <source>- A few seconds later you should hear a number of beeps (one for each battery cell you’re using)</source>
-      <translation type="unfinished">- A few seconds later you should hear a number of beeps (one for each battery cell you’re using)</translation>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="269"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="269"/>
+      <source>- A few seconds later you should hear a number of beeps (one for each battery cell you&apos;re using)</source>
+      <translation type="unfinished">- A few seconds later you should hear a number of beeps (one for each battery cell you&apos;re using)</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="268"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="268"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="270"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="270"/>
       <source>- And finally a single long beep indicating the end points have been set and the ESC is calibrated</source>
       <translation type="unfinished">- And finally a single long beep indicating the end points have been set and the ESC is calibrated</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="269"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="269"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="271"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="271"/>
       <source>- Disconnect the battery and power up again normally</source>
       <translation type="unfinished">- Disconnect the battery and power up again normally</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="310"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="310"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="313"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="313"/>
       <source>Power Module 90A</source>
       <translation type="unfinished">Power Module 90A</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="318"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="318"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="322"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="322"/>
       <source>Power Module HV</source>
       <translation type="unfinished">Power Module HV</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="326"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="326"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="331"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="331"/>
       <source>3DR Iris</source>
       <translation type="unfinished">3DR Iris</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="334"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="334"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="340"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="340"/>
+      <source>Blue Robotics Power Sense Module R2</source>
+      <translation type="unfinished">Blue Robotics Power Sense Module R2</translation>
+    </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="349"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="349"/>
       <source>Other</source>
       <translation type="unfinished">Other</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="344"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="344"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="359"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="359"/>
       <source>Battery monitor:</source>
       <translation type="unfinished">Battery monitor:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="355"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="355"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="370"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="370"/>
       <source>Battery capacity:</source>
       <translation type="unfinished">Battery capacity:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="367"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="367"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="382"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="382"/>
       <source>Minimum arming voltage:</source>
       <translation type="unfinished">Minimum arming voltage:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="379"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="379"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="394"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="394"/>
       <source>Power sensor:</source>
       <translation type="unfinished">Power sensor:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="402"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="402"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="419"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="419"/>
       <source>Current pin:</source>
       <translation type="unfinished">Current pin:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="416"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="416"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="433"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="433"/>
       <source>Voltage pin:</source>
       <translation type="unfinished">Voltage pin:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="430"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="534"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="430"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="534"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="447"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="572"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="447"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="572"/>
       <source>Voltage multiplier:</source>
       <translation type="unfinished">Voltage multiplier:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="441"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="473"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="441"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="473"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="458"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="490"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="458"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="490"/>
       <source>Calculate</source>
       <translation type="unfinished">Calculate</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="447"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="447"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="464"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="464"/>
       <source>Calculate Voltage Multiplier</source>
       <translation type="unfinished">Calculate Voltage Multiplier</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="457"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="457"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="474"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="474"/>
       <source>If the battery voltage reported by the vehicle is largely different than the voltage read externally using a voltmeter you can adjust the voltage multiplier value to correct this. Click the Calculate button for help with calculating a new value.</source>
       <translation type="unfinished">If the battery voltage reported by the vehicle is largely different than the voltage read externally using a voltmeter you can adjust the voltage multiplier value to correct this. Click the Calculate button for help with calculating a new value.</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="462"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="596"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="462"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="596"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="479"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="634"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="479"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="634"/>
       <source>Amps per volt:</source>
       <translation type="unfinished">Amps per volt:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="479"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="479"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="496"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="496"/>
       <source>Calculate Amps per Volt</source>
       <translation type="unfinished">Calculate Amps per Volt</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="488"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="488"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="505"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="505"/>
       <source>If the current draw reported by the vehicle is largely different than the current read externally using a current meter you can adjust the amps per volt value to correct this. Click the Calculate button for help with calculating a new value.</source>
       <translation type="unfinished">If the current draw reported by the vehicle is largely different than the current read externally using a current meter you can adjust the amps per volt value to correct this. Click the Calculate button for help with calculating a new value.</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="518"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="518"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="510"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="510"/>
+      <source>Amps Offset:</source>
+      <translation type="unfinished">Amps Offset:</translation>
+    </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="525"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="525"/>
+      <source>If the vehicle reports a high current read when there is little or no current going through it, adjust the Amps Offset. It should be equal to the voltage reported by the sensor when the current is zero.</source>
+      <translation type="unfinished">If the vehicle reports a high current read when there is little or no current going through it, adjust the Amps Offset. It should be equal to the voltage reported by the sensor when the current is zero.</translation>
+    </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="556"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="556"/>
       <source>Measure battery voltage using an external voltmeter and enter the value below. Click Calculate to set the new adjusted voltage multiplier.</source>
       <translation type="unfinished">Measure battery voltage using an external voltmeter and enter the value below. Click Calculate to set the new adjusted voltage multiplier.</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="527"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="527"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="565"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="565"/>
       <source>Measured voltage:</source>
       <translation type="unfinished">Measured voltage:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="531"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="531"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="569"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="569"/>
       <source>Vehicle voltage:</source>
       <translation type="unfinished">Vehicle voltage:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="539"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="601"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="539"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="601"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="577"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="639"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="577"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="639"/>
       <source>Calculate And Set</source>
       <translation type="unfinished">Calculate And Set</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="580"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="580"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="618"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="618"/>
       <source>Measure current draw using an external current meter and enter the value below. Click Calculate to set the new amps per volt value.</source>
       <translation type="unfinished">Measure current draw using an external current meter and enter the value below. Click Calculate to set the new amps per volt value.</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="589"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="589"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="627"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="627"/>
       <source>Measured current:</source>
       <translation type="unfinished">Measured current:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="593"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="593"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="631"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="631"/>
       <source>Vehicle current:</source>
       <translation type="unfinished">Vehicle current:</translation>
     </message>
@@ -1183,26 +1459,26 @@
   <context>
     <name>APMPowerComponentSummary</name>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="37"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="36"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="36"/>
       <source>Batt1 monitor</source>
       <translation type="unfinished">Batt1 monitor</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="42"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="41"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="41"/>
       <source>Batt1 capacity</source>
       <translation type="unfinished">Batt1 capacity</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="48"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="48"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="47"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="47"/>
       <source>Batt2 monitor</source>
       <translation type="unfinished">Batt2 monitor</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="54"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="54"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="53"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="53"/>
       <source>Batt2 capacity</source>
       <translation type="unfinished">Batt2 capacity</translation>
     </message>
@@ -1223,50 +1499,50 @@
   <context>
     <name>APMRadioComponentSummary</name>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="25"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="25"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="23"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="23"/>
       <source>Roll</source>
       <translation type="unfinished">Roll</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="26"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="31"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="36"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="41"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="26"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="31"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="36"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="41"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="24"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="29"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="34"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="39"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="24"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="29"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="34"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="39"/>
       <source>Setup required</source>
       <translation type="unfinished">Setup required</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="26"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="31"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="36"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="41"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="26"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="31"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="36"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="41"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="24"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="29"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="34"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="39"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="24"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="29"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="34"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="39"/>
       <source>Channel %1</source>
       <translation type="unfinished">Channel %1</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="30"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="30"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="28"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="28"/>
       <source>Pitch</source>
       <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="35"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="35"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="33"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="33"/>
       <source>Yaw</source>
       <translation type="unfinished">Yaw</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="40"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="40"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="38"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="38"/>
       <source>Throttle</source>
       <translation type="unfinished">Throttle</translation>
     </message>
@@ -1274,238 +1550,238 @@
   <context>
     <name>APMSafetyComponent</name>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="63"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="63"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="66"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="66"/>
       <source>Requires vehicle reboot</source>
       <translation type="unfinished">Requires vehicle reboot</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="76"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="76"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="79"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="79"/>
       <source>Low action:</source>
       <translation type="unfinished">Low action:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="83"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="83"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="86"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="86"/>
       <source>Critical action:</source>
       <translation type="unfinished">Critical action:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="90"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="90"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="93"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="93"/>
       <source>Low voltage threshold:</source>
       <translation type="unfinished">Low voltage threshold:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="98"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="98"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="101"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="101"/>
       <source>Critical voltage threshold:</source>
       <translation type="unfinished">Critical voltage threshold:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="105"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="105"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="108"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="108"/>
       <source>Low mAh threshold:</source>
       <translation type="unfinished">Low mAh threshold:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="112"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="112"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="115"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="115"/>
       <source>Critical mAh threshold:</source>
       <translation type="unfinished">Critical mAh threshold:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="133"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="133"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="136"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="136"/>
       <source>Reboot vehicle</source>
       <translation type="unfinished">Reboot vehicle</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="144"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="144"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="147"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="147"/>
       <source>Battery1 Failsafe Triggers</source>
       <translation type="unfinished">Battery1 Failsafe Triggers</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="178"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="178"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="181"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="181"/>
       <source>Battery2 Failsafe Triggers</source>
       <translation type="unfinished">Battery2 Failsafe Triggers</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="217"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="276"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="217"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="276"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="220"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="279"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="220"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="279"/>
       <source>Failsafe Triggers</source>
       <translation type="unfinished">Failsafe Triggers</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="235"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="235"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="238"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="238"/>
       <source>Throttle PWM threshold:</source>
       <translation type="unfinished">Throttle PWM threshold:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="249"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="249"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="252"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="252"/>
       <source>GCS failsafe</source>
       <translation type="unfinished">GCS failsafe</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="293"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="363"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="293"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="363"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="296"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="366"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="296"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="366"/>
       <source>Ground Station failsafe:</source>
       <translation type="unfinished">Ground Station failsafe:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="300"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="370"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="300"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="370"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="303"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="373"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="303"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="373"/>
       <source>Throttle failsafe:</source>
       <translation type="unfinished">Throttle failsafe:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="307"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="380"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="307"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="380"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="310"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="383"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="310"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="383"/>
       <source>PWM threshold:</source>
       <translation type="unfinished">PWM threshold:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="313"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="313"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="316"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="316"/>
       <source>Failsafe Crash Check:</source>
       <translation type="unfinished">Failsafe Crash Check:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="342"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="342"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="345"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="345"/>
       <source>General Failsafe Triggers</source>
       <translation type="unfinished">General Failsafe Triggers</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="372"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="372"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="375"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="375"/>
       <source>Disabled</source>
       <translation type="unfinished">Disabled</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="372"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="372"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="375"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="375"/>
       <source>Always RTL</source>
       <translation type="unfinished">Always RTL</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="373"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="373"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="376"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="376"/>
       <source>Continue with Mission in Auto Mode</source>
       <translation type="unfinished">Continue with Mission in Auto Mode</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="373"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="373"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="376"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="376"/>
       <source>Always Land</source>
       <translation type="unfinished">Always Land</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="411"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="411"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="414"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="414"/>
       <source>GeoFence</source>
       <translation type="unfinished">GeoFence</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="426"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="426"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="429"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="429"/>
       <source>Circle GeoFence enabled</source>
       <translation type="unfinished">Circle GeoFence enabled</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="451"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="451"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="454"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="454"/>
       <source>Altitude GeoFence enabled</source>
       <translation type="unfinished">Altitude GeoFence enabled</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="476"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="476"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="479"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="479"/>
       <source>Report only</source>
       <translation type="unfinished">Report only</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="487"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="487"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="490"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="490"/>
       <source>RTL or Land</source>
       <translation type="unfinished">RTL or Land</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="497"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="497"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="500"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="500"/>
       <source>Max radius:</source>
       <translation type="unfinished">Max radius:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="513"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="513"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="516"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="516"/>
       <source>Max altitude:</source>
       <translation type="unfinished">Max altitude:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="546"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="684"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="546"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="684"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="549"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="678"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="549"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="678"/>
       <source>Return to Launch</source>
       <translation type="unfinished">Return to Launch</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="582"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="698"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="582"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="698"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="585"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="692"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="585"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="692"/>
       <source>Return at current altitude</source>
       <translation type="unfinished">Return at current altitude</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="593"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="709"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="593"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="709"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="596"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="703"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="596"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="703"/>
       <source>Return at specified altitude:</source>
       <translation type="unfinished">Return at specified altitude:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="614"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="614"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="617"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="617"/>
       <source>Loiter above Home for:</source>
       <translation type="unfinished">Loiter above Home for:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="633"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="633"/>
-      <source>Land with descent speed:</source>
-      <translation type="unfinished">Land with descent speed:</translation>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="635"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="635"/>
+      <source>Final land stage altitude:</source>
+      <translation type="unfinished">Final land stage altitude:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="653"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="653"/>
-      <source>Final loiter altitude:</source>
-      <translation type="unfinished">Final loiter altitude:</translation>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="650"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="650"/>
+      <source>Final land stage descent speed:</source>
+      <translation type="unfinished">Final land stage descent speed:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="736"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="736"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="730"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="730"/>
       <source>Arming Checks</source>
       <translation type="unfinished">Arming Checks</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="767"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="767"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="761"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="761"/>
       <source>Warning: Turning off arming checks can lead to loss of Vehicle control.</source>
       <translation type="unfinished">Warning: Turning off arming checks can lead to loss of Vehicle control.</translation>
     </message>
@@ -1851,132 +2127,132 @@
   <context>
     <name>APMSafetyComponentSummary</name>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="34"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="34"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="37"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="37"/>
       <source>Arming Checks:</source>
       <translation type="unfinished">Arming Checks:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="35"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="35"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="38"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="38"/>
       <source>Enabled</source>
       <translation type="unfinished">Enabled</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="35"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="35"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="38"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="38"/>
       <source>Some disabled</source>
       <translation type="unfinished">Some disabled</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="41"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="49"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="57"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="41"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="49"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="57"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="44"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="52"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="60"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="44"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="52"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="60"/>
       <source>Throttle failsafe:</source>
       <translation type="unfinished">Throttle failsafe:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="65"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="65"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="68"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="68"/>
       <source>Failsafe Action:</source>
       <translation type="unfinished">Failsafe Action:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="73"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="73"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="76"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="76"/>
       <source>Failsafe Crash Check:</source>
       <translation type="unfinished">Failsafe Crash Check:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="81"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="81"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="84"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="84"/>
       <source>Batt1 low failsafe:</source>
       <translation type="unfinished">Batt1 low failsafe:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="87"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="87"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="90"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="90"/>
       <source>Batt1 critical failsafe:</source>
       <translation type="unfinished">Batt1 critical failsafe:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="93"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="93"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="96"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="96"/>
       <source>Batt2 low failsafe:</source>
       <translation type="unfinished">Batt2 low failsafe:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="99"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="99"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="102"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="102"/>
       <source>Batt2 critical failsafe:</source>
       <translation type="unfinished">Batt2 critical failsafe:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="105"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="115"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="105"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="115"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="108"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="129"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="108"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="129"/>
       <source>GeoFence:</source>
       <translation type="unfinished">GeoFence:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="107"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="107"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="112"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="112"/>
       <source>Disabled</source>
       <translation type="unfinished">Disabled</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="109"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="109"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="115"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="115"/>
       <source>Altitude</source>
       <translation type="unfinished">Altitude</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="110"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="110"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="118"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="118"/>
       <source>Circle</source>
       <translation type="unfinished">Circle</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="110"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="110"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="120"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="120"/>
       <source>Altitude,Circle</source>
       <translation type="unfinished">Altitude,Circle</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="117"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="117"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="131"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="131"/>
       <source>Report only</source>
       <translation type="unfinished">Report only</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="118"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="118"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="132"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="132"/>
       <source>RTL or Land</source>
       <translation type="unfinished">RTL or Land</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="118"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="118"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="132"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="132"/>
       <source>Unknown</source>
       <translation type="unfinished">Unknown</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="123"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="131"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="123"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="131"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="137"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="145"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="137"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="145"/>
       <source>RTL min alt:</source>
       <translation type="unfinished">RTL min alt:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="124"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="132"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="124"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="132"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="138"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="146"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="138"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="146"/>
       <source>current</source>
       <translation type="unfinished">current</translation>
     </message>
@@ -2785,34 +3061,34 @@
   <context>
     <name>APMSensorsComponentSummary</name>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="34"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="34"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="33"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="33"/>
       <source>Compass </source>
       <translation type="unfinished">Compass </translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="41"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="48"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="41"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="48"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="40"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="47"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="40"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="47"/>
       <source>Setup required</source>
       <translation type="unfinished">Setup required</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="42"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="41"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="41"/>
       <source>Not installed</source>
       <translation type="unfinished">Not installed</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="47"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="46"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="46"/>
       <source>Accelerometer(s)</source>
       <translation type="unfinished">Accelerometer(s)</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="48"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="48"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="47"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="47"/>
       <source>Ready</source>
       <translation type="unfinished">Ready</translation>
     </message>
@@ -2880,14 +3156,14 @@ propellers on the green thrusters and counter-clockwise propellers on the blue t
   <context>
     <name>APMSubMotorComponent</name>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="113"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="113"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="116"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="116"/>
       <source>Reverse Motor Direction</source>
       <translation type="unfinished">Reverse Motor Direction</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="160"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="160"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="163"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="163"/>
       <source>Moving the sliders will cause the motors to spin. Make sure the motors and propellers are clear from obstructions! The direction of the motor rotation is dependent on how the three phases of the motor are physically connected to the ESCs (if any two wires are swapped, the direction of rotation will flip). Because we cannot guarantee what order the phases are connected, the motor directions must be configured in software. When a slider is moved DOWN, the thruster should push air/water TOWARD the cable entering the housing. Click the checkbox to reverse the direction of the corresponding thruster.
 
 Blue Robotics thrusters are lubricated by water and are not designed to be run in air. Testing the thrusters in air is ok at low speeds for short periods of time. Extended operation of Blue Robotics in air may lead to overheating and permanent damage. Without water lubrication, Blue Robotics thrusters may also make some unpleasant noises when operated in air; this is normal.</source>
@@ -2896,11 +3172,31 @@ Blue Robotics thrusters are lubricated by water and are not designed to be run i
 Blue Robotics thrusters are lubricated by water and are not designed to be run in air. Testing the thrusters in air is ok at low speeds for short periods of time. Extended operation of Blue Robotics in air may lead to overheating and permanent damage. Without water lubrication, Blue Robotics thrusters may also make some unpleasant noises when operated in air; this is normal.</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="198"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="198"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="206"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="206"/>
+      <source>A 10 second coooldown is required before testing again, please stand by...</source>
+      <translation type="unfinished">A 10 second coooldown is required before testing again, please stand by...</translation>
+    </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="207"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="207"/>
       <source>Slide this switch to arm the vehicle and enable the motor test (CAUTION!)</source>
       <translation type="unfinished">Slide this switch to arm the vehicle and enable the motor test (CAUTION!)</translation>
     </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="217"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="217"/>
+      <source>Automatic Motor Direction Detection</source>
+      <translation type="unfinished">Automatic Motor Direction Detection</translation>
+    </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="225"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="225"/>
+      <source>This will attempt to automatically detect the direction (normal/reversed) of your thrusters.
+Please place your vehicle in water, click the button, and wait. Note that the thrusters still need to be connected to the correct outputs (thrusters 2 and 3 can&apos;t be swapped, for example).</source>
+      <translation type="unfinished">This will attempt to automatically detect the direction (normal/reversed) of your thrusters.
+Please place your vehicle in water, click the button, and wait. Note that the thrusters still need to be connected to the correct outputs (thrusters 2 and 3 can&apos;t be swapped, for example).</translation>
+    </message>
   </context>
   <context>
     <name>APMTuningComponent</name>
@@ -2918,176 +3214,176 @@ Blue Robotics thrusters are lubricated by water and are not designed to be run i
   <context>
     <name>APMTuningComponentCopter</name>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="127"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="127"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="129"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="129"/>
       <source>Basic Tuning</source>
       <translation type="unfinished">Basic Tuning</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="151"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="151"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="153"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="153"/>
       <source>Roll/Pitch Sensitivity</source>
       <translation type="unfinished">Roll/Pitch Sensitivity</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="156"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="156"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="158"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="158"/>
       <source>Slide to the right if the copter is sluggish or slide to the left if the copter is twitchy</source>
       <translation type="unfinished">Slide to the right if the copter is sluggish or slide to the left if the copter is twitchy</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="184"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="184"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="186"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="186"/>
       <source>Climb Sensitivity</source>
       <translation type="unfinished">Climb Sensitivity</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="189"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="189"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="191"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="191"/>
       <source>Slide to the right to climb more aggressively or slide to the left to climb more gently</source>
       <translation type="unfinished">Slide to the right to climb more aggressively or slide to the left to climb more gently</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="217"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="217"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="219"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="219"/>
       <source>RC Roll/Pitch Feel</source>
       <translation type="unfinished">RC Roll/Pitch Feel</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="222"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="222"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="224"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="224"/>
       <source>Slide to the left for soft control, slide to the right for crisp control</source>
       <translation type="unfinished">Slide to the left for soft control, slide to the right for crisp control</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="247"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="247"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="249"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="249"/>
       <source>Spin While Armed</source>
       <translation type="unfinished">Spin While Armed</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="252"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="252"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="254"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="254"/>
       <source>Adjust the amount the motors spin to indicate armed</source>
       <translation type="unfinished">Adjust the amount the motors spin to indicate armed</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="277"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="277"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="279"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="279"/>
       <source>Minimum Thrust</source>
       <translation type="unfinished">Minimum Thrust</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="282"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="282"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="284"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="284"/>
       <source>Adjust the minimum amount of thrust require for the vehicle to move</source>
       <translation type="unfinished">Adjust the minimum amount of thrust require for the vehicle to move</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="286"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="286"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="288"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="288"/>
       <source>Warning: This setting should be higher than &apos;Spin While Armed&apos;</source>
       <translation type="unfinished">Warning: This setting should be higher than &apos;Spin While Armed&apos;</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="322"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="322"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="324"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="324"/>
       <source>AutoTune</source>
       <translation type="unfinished">AutoTune</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="343"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="343"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="345"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="345"/>
       <source>Axes to AutoTune:</source>
       <translation type="unfinished">Axes to AutoTune:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="352"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="352"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="354"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="354"/>
       <source>Channel for AutoTune switch:</source>
       <translation type="unfinished">Channel for AutoTune switch:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="358"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="358"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="360"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="360"/>
       <source>None</source>
       <translation type="unfinished">None</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="358"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="358"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="360"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="360"/>
       <source>Channel 7</source>
       <translation type="unfinished">Channel 7</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="358"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="358"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="360"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="360"/>
       <source>Channel 8</source>
       <translation type="unfinished">Channel 8</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="358"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="358"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="360"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="360"/>
       <source>Channel 9</source>
       <translation type="unfinished">Channel 9</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="358"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="358"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="360"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="360"/>
       <source>Channel 10</source>
       <translation type="unfinished">Channel 10</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="358"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="358"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="360"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="360"/>
       <source>Channel 11</source>
       <translation type="unfinished">Channel 11</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="358"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="358"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="360"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="360"/>
       <source>Channel 12</source>
       <translation type="unfinished">Channel 12</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="382"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="382"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="384"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="384"/>
       <source>In Flight Tuning</source>
       <translation type="unfinished">In Flight Tuning</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="406"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="406"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="408"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="408"/>
       <source>RC Channel 6 Option (Tuning):</source>
       <translation type="unfinished">RC Channel 6 Option (Tuning):</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="424"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="424"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="426"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="426"/>
       <source>Min:</source>
       <translation type="unfinished">Min:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="436"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="436"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="438"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="438"/>
       <source>Max:</source>
       <translation type="unfinished">Max:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="464"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="464"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="466"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="466"/>
       <source>Roll</source>
       <translation type="unfinished">Roll</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="464"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="464"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="466"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="466"/>
       <source>Pitch</source>
       <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="464"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="464"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="466"/>
+      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="466"/>
       <source>Yaw</source>
       <translation type="unfinished">Yaw</translation>
     </message>
@@ -3134,20 +3430,14 @@ Blue Robotics thrusters are lubricated by water and are not designed to be run i
   <context>
     <name>AirframeComponent</name>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="68"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="68"/>
-      <source>Custom Airframe Config</source>
-      <translation type="unfinished">Custom Airframe Config</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="78"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="78"/>
+      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="45"/>
+      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="45"/>
       <source>Your vehicle is using a custom airframe configuration. </source>
       <translation type="unfinished">Your vehicle is using a custom airframe configuration. </translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="79"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="79"/>
+      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="46"/>
+      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="46"/>
       <source>This configuration can only be modified through the Parameter Editor.
 
 </source>
@@ -3156,40 +3446,46 @@ Blue Robotics thrusters are lubricated by water and are not designed to be run i
 </translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="80"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="80"/>
-      <source>If you want to reset your airframe configuration and select a standard configuration, click &apos;Reset&apos; above.</source>
-      <translation type="unfinished">If you want to reset your airframe configuration and select a standard configuration, click &apos;Reset&apos; above.</translation>
+      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="47"/>
+      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="47"/>
+      <source>If you want to reset your airframe configuration and select a standard configuration, click &apos;Reset&apos; below.</source>
+      <translation type="unfinished">If you want to reset your airframe configuration and select a standard configuration, click &apos;Reset&apos; below.</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="105"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="105"/>
-      <source>Clicking “Apply” will save the changes you have made to your airframe configuration.&lt;br&gt;&lt;br&gt;All vehicle parameters other than Radio Calibration will be reset.&lt;br&gt;&lt;br&gt;Your vehicle will also be restarted in order to complete the process.</source>
-      <translation type="unfinished">Clicking “Apply” will save the changes you have made to your airframe configuration.&lt;br&gt;&lt;br&gt;All vehicle parameters other than Radio Calibration will be reset.&lt;br&gt;&lt;br&gt;Your vehicle will also be restarted in order to complete the process.</translation>
+      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="50"/>
+      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="50"/>
+      <source>Reset</source>
+      <translation type="unfinished">Reset</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="122"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="122"/>
-      <source>You&apos;ve connected a %1.</source>
-      <translation type="unfinished">You&apos;ve connected a %1.</translation>
+      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="114"/>
+      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="114"/>
+      <source>Clicking &apos;Apply&apos; will save the changes you have made to your airframe configuration.&lt;br&gt;&lt;br&gt;All vehicle parameters other than Radio Calibration will be reset.&lt;br&gt;&lt;br&gt;Your vehicle will also be restarted in order to complete the process.</source>
+      <translation type="unfinished">Clicking &apos;Apply&apos; will save the changes you have made to your airframe configuration.&lt;br&gt;&lt;br&gt;All vehicle parameters other than Radio Calibration will be reset.&lt;br&gt;&lt;br&gt;Your vehicle will also be restarted in order to complete the process.</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="123"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="123"/>
-      <source>Airframe is not set.</source>
-      <translation type="unfinished">Airframe is not set.</translation>
+      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="133"/>
+      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="133"/>
+      <source>To change this configuration, select the desired airframe below then click &apos;Apply and Restart&apos;.</source>
+      <translation type="unfinished">To change this configuration, select the desired airframe below then click &apos;Apply and Restart&apos;.</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="124"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="124"/>
-      <source>To change this configuration, select the desired airframe below then click “Apply and Restart”.</source>
-      <translation type="unfinished">To change this configuration, select the desired airframe below then click “Apply and Restart”.</translation>
+      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="131"/>
+      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="131"/>
+      <source>You&apos;ve connected a %1.</source>
+      <translation type="unfinished">You&apos;ve connected a %1.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="132"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="134"/>
       <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="132"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="134"/>
+      <source>Airframe is not set.</source>
+      <translation type="unfinished">Airframe is not set.</translation>
+    </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="141"/>
+      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="143"/>
+      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="141"/>
+      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="143"/>
       <source>Apply and Restart</source>
       <translation type="unfinished">Apply and Restart</translation>
     </message>
@@ -3200,8 +3496,8 @@ Blue Robotics thrusters are lubricated by water and are not designed to be run i
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.cc" line="31"/>
-      <source>Airframe Setup is used to select the airframe which matches your vehicle. This will in turn set up the various tuning values for flight parameters.</source>
-      <translation type="unfinished">Airframe Setup is used to select the airframe which matches your vehicle. This will in turn set up the various tuning values for flight parameters.</translation>
+      <source>Airframe Setup is used to select the airframe that matches your vehicle. This will in turn set up the various tuning values for flight parameters.</source>
+      <translation type="unfinished">Airframe Setup is used to select the airframe that matches your vehicle. This will in turn set up the various tuning values for flight parameters.</translation>
     </message>
   </context>
   <context>
@@ -3686,56 +3982,48 @@ Blue Robotics thrusters are lubricated by water and are not designed to be run i
   <context>
     <name>AltitudeFactTextField</name>
     <message>
-      <location filename="../src/FactSystem/FactControls/AltitudeFactTextField.qml" line="14"/>
+      <location filename="../src/FactSystem/FactControls/AltitudeFactTextField.qml" line="28"/>
       <source>(Rel)</source>
       <translation type="unfinished">(Rel)</translation>
     </message>
     <message>
-      <location filename="../src/FactSystem/FactControls/AltitudeFactTextField.qml" line="15"/>
+      <location filename="../src/FactSystem/FactControls/AltitudeFactTextField.qml" line="29"/>
       <source>(AMSL)</source>
       <translation type="unfinished">(AMSL)</translation>
     </message>
     <message>
-      <location filename="../src/FactSystem/FactControls/AltitudeFactTextField.qml" line="16"/>
+      <location filename="../src/FactSystem/FactControls/AltitudeFactTextField.qml" line="30"/>
       <source>(Abv Terr)</source>
       <translation type="unfinished">(Abv Terr)</translation>
     </message>
     <message>
-      <location filename="../src/FactSystem/FactControls/AltitudeFactTextField.qml" line="17"/>
+      <location filename="../src/FactSystem/FactControls/AltitudeFactTextField.qml" line="31"/>
       <source>(TerrF)</source>
       <translation type="unfinished">(TerrF)</translation>
     </message>
+    <message>
+      <location filename="../src/FactSystem/FactControls/AltitudeFactTextField.qml" line="49"/>
+      <source>Warning</source>
+      <translation type="unfinished">Warning</translation>
+    </message>
+    <message>
+      <location filename="../src/FactSystem/FactControls/AltitudeFactTextField.qml" line="70"/>
+      <source>&apos;Above Terrain&apos; will set an absolute altitude for the item based on the terrain height at the location and the requested altitude above terrain. It does not send terrain heights to the vehicle.</source>
+      <translation type="unfinished">&apos;Above Terrain&apos; will set an absolute altitude for the item based on the terrain height at the location and the requested altitude above terrain. It does not send terrain heights to the vehicle.</translation>
+    </message>
+    <message>
+      <location filename="../src/FactSystem/FactControls/AltitudeFactTextField.qml" line="74"/>
+      <source>Don&apos;t show again</source>
+      <translation type="unfinished">Don&apos;t show again</translation>
+    </message>
   </context>
   <context>
     <name>AnalyzeView</name>
     <message>
-      <location filename="../src/AnalyzeView/AnalyzeView.qml" line="85"/>
+      <location filename="../src/AnalyzeView/AnalyzeView.qml" line="88"/>
       <source>Analyze</source>
       <translation type="unfinished">Analyze</translation>
     </message>
-    <message>
-      <location filename="../src/AnalyzeView/AnalyzeView.qml" line="95"/>
-      <location filename="../src/AnalyzeView/AnalyzeView.qml" line="119"/>
-      <source>Log Download</source>
-      <translation type="unfinished">Log Download</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/AnalyzeView.qml" line="100"/>
-      <source>GeoTag Images</source>
-      <translation type="unfinished">GeoTag Images</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/AnalyzeView.qml" line="105"/>
-      <location filename="../src/AnalyzeView/AnalyzeView.qml" line="124"/>
-      <source>MAVLink Console</source>
-      <translation type="unfinished">MAVLink Console</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/AnalyzeView.qml" line="110"/>
-      <location filename="../src/AnalyzeView/AnalyzeView.qml" line="129"/>
-      <source>MAVLink Inspector</source>
-      <translation type="unfinished">MAVLink Inspector</translation>
-    </message>
   </context>
   <context>
     <name>AppLogModel</name>
@@ -3748,52 +4036,62 @@ Blue Robotics thrusters are lubricated by water and are not designed to be run i
   <context>
     <name>AppMessages</name>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="40"/>
+      <location filename="../src/QmlControls/AppMessages.qml" line="47"/>
+      <source>Search:</source>
+      <translation type="unfinished">Search:</translation>
+    </message>
+    <message>
+      <location filename="../src/QmlControls/AppMessages.qml" line="58"/>
+      <source>Clear</source>
+      <translation type="unfinished">Clear</translation>
+    </message>
+    <message>
+      <location filename="../src/QmlControls/AppMessages.qml" line="66"/>
       <source>Clear All</source>
       <translation type="unfinished">Clear All</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="127"/>
+      <location filename="../src/QmlControls/AppMessages.qml" line="164"/>
       <source>Log files (*.txt)</source>
       <translation type="unfinished">Log files (*.txt)</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="127"/>
+      <location filename="../src/QmlControls/AppMessages.qml" line="164"/>
       <source>All Files (*)</source>
       <translation type="unfinished">All Files (*)</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="128"/>
+      <location filename="../src/QmlControls/AppMessages.qml" line="165"/>
       <source>txt</source>
       <translation type="unfinished">txt</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="130"/>
+      <location filename="../src/QmlControls/AppMessages.qml" line="167"/>
       <source>Select log save file</source>
       <translation type="unfinished">Select log save file</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="148"/>
+      <location filename="../src/QmlControls/AppMessages.qml" line="185"/>
       <source>Save App Log</source>
       <translation type="unfinished">Save App Log</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="156"/>
+      <location filename="../src/QmlControls/AppMessages.qml" line="193"/>
       <source>GStreamer Debug</source>
       <translation type="unfinished">GStreamer Debug</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="176"/>
+      <location filename="../src/QmlControls/AppMessages.qml" line="213"/>
       <source>Show Latest</source>
       <translation type="unfinished">Show Latest</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="191"/>
+      <location filename="../src/QmlControls/AppMessages.qml" line="228"/>
       <source>Set Logging</source>
       <translation type="unfinished">Set Logging</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="192"/>
+      <location filename="../src/QmlControls/AppMessages.qml" line="229"/>
       <source>Turn on logging categories</source>
       <translation type="unfinished">Turn on logging categories</translation>
     </message>
@@ -3809,30 +4107,40 @@ Blue Robotics thrusters are lubricated by water and are not designed to be run i
   <context>
     <name>ArmedIndicator</name>
     <message>
-      <location filename="../src/ui/toolbar/ArmedIndicator.qml" line="26"/>
+      <location filename="../src/ui/toolbar/ArmedIndicator.qml" line="24"/>
       <source>Armed</source>
       <translation type="unfinished">Armed</translation>
     </message>
     <message>
-      <location filename="../src/ui/toolbar/ArmedIndicator.qml" line="26"/>
+      <location filename="../src/ui/toolbar/ArmedIndicator.qml" line="24"/>
       <source>Disarmed</source>
       <translation type="unfinished">Disarmed</translation>
     </message>
+    <message>
+      <location filename="../src/ui/toolbar/ArmedIndicator.qml" line="25"/>
+      <source>Arm</source>
+      <translation type="unfinished">Arm</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/toolbar/ArmedIndicator.qml" line="25"/>
+      <source>Disarm</source>
+      <translation type="unfinished">Disarm</translation>
+    </message>
   </context>
   <context>
     <name>AudioOutput</name>
     <message>
-      <location filename="../src/Audio/AudioOutput.cc" line="135"/>
+      <location filename="../src/Audio/AudioOutput.cc" line="155"/>
       <source> negative </source>
       <translation type="unfinished"> negative </translation>
     </message>
     <message>
-      <location filename="../src/Audio/AudioOutput.cc" line="146"/>
+      <location filename="../src/Audio/AudioOutput.cc" line="166"/>
       <source> point </source>
       <translation type="unfinished"> point </translation>
     </message>
     <message>
-      <location filename="../src/Audio/AudioOutput.cc" line="157"/>
+      <location filename="../src/Audio/AudioOutput.cc" line="177"/>
       <source> meters</source>
       <translation type="unfinished"> meters</translation>
     </message>
@@ -3845,33 +4153,49 @@ Blue Robotics thrusters are lubricated by water and are not designed to be run i
       <translation type="unfinished">One or more vehicle components require setup prior to flight.</translation>
     </message>
   </context>
+  <context>
+    <name>AxisMonitor</name>
+    <message>
+      <location filename="../src/QmlControls/AxisMonitor.qml" line="69"/>
+      <source>Not Mapped</source>
+      <translation type="unfinished">Not Mapped</translation>
+    </message>
+  </context>
   <context>
     <name>BatteryIndicator</name>
     <message>
-      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="76"/>
+      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="78"/>
       <source>Battery Status</source>
       <translation type="unfinished">Battery Status</translation>
     </message>
     <message>
-      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="88"/>
+      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="90"/>
       <source>Voltage:</source>
       <translation type="unfinished">Voltage:</translation>
     </message>
     <message>
-      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="90"/>
+      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="92"/>
       <source>Accumulated Consumption:</source>
       <translation type="unfinished">Accumulated Consumption:</translation>
     </message>
   </context>
+  <context>
+    <name>BlankPlanCreator</name>
+    <message>
+      <location filename="../src/MissionManager/BlankPlanCreator.cc" line="16"/>
+      <source>Blank</source>
+      <translation type="unfinished">Blank</translation>
+    </message>
+  </context>
   <context>
     <name>BluetoothConfiguration</name>
     <message>
-      <location filename="../src/comm/BluetoothLink.cc" line="264"/>
+      <location filename="../src/comm/BluetoothLink.cc" line="265"/>
       <source>Bluetooth Link Settings</source>
       <translation type="unfinished">Bluetooth Link Settings</translation>
     </message>
     <message>
-      <location filename="../src/comm/BluetoothLink.cc" line="266"/>
+      <location filename="../src/comm/BluetoothLink.cc" line="267"/>
       <source>Bluetooth Not Available</source>
       <translation type="unfinished">Bluetooth Not Available</translation>
     </message>
@@ -3879,7 +4203,7 @@ Blue Robotics thrusters are lubricated by water and are not designed to be run i
   <context>
     <name>BluetoothLink</name>
     <message>
-      <location filename="../src/comm/BluetoothLink.cc" line="212"/>
+      <location filename="../src/comm/BluetoothLink.cc" line="213"/>
       <source>Bluetooth Link Error</source>
       <translation type="unfinished">Bluetooth Link Error</translation>
     </message>
@@ -4043,159 +4367,77 @@ Blue Robotics thrusters are lubricated by water and are not designed to be run i
     </message>
   </context>
   <context>
-    <name>BuiltInPreFlightCheckModel</name>
-    <message>
-      <location filename="../src/FlightDisplay/BuiltInPreFlightCheckModel.qml" line="22"/>
-      <source>Initial checks</source>
-      <translation type="unfinished">Initial checks</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/BuiltInPreFlightCheckModel.qml" line="26"/>
-      <source>Hardware</source>
-      <translation type="unfinished">Hardware</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/BuiltInPreFlightCheckModel.qml" line="27"/>
-      <source>Props mounted? Wings secured? Tail secured?</source>
-      <translation type="unfinished">Props mounted? Wings secured? Tail secured?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/BuiltInPreFlightCheckModel.qml" line="48"/>
-      <source>Please arm the vehicle here</source>
-      <translation type="unfinished">Please arm the vehicle here</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/BuiltInPreFlightCheckModel.qml" line="51"/>
-      <source>Actuators</source>
-      <translation type="unfinished">Actuators</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/BuiltInPreFlightCheckModel.qml" line="52"/>
-      <source>Move all control surfaces. Did they work properly?</source>
-      <translation type="unfinished">Move all control surfaces. Did they work properly?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/BuiltInPreFlightCheckModel.qml" line="56"/>
-      <source>Motors</source>
-      <translation type="unfinished">Motors</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/BuiltInPreFlightCheckModel.qml" line="57"/>
-      <source>Propellers free? Then throttle up gently. Working properly?</source>
-      <translation type="unfinished">Propellers free? Then throttle up gently. Working properly?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/BuiltInPreFlightCheckModel.qml" line="61"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/BuiltInPreFlightCheckModel.qml" line="62"/>
-      <source>Please confirm mission is valid (waypoints valid, no terrain collision).</source>
-      <translation type="unfinished">Please confirm mission is valid (waypoints valid, no terrain collision).</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/BuiltInPreFlightCheckModel.qml" line="70"/>
-      <source>Last preparations before launch</source>
-      <translation type="unfinished">Last preparations before launch</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/BuiltInPreFlightCheckModel.qml" line="74"/>
-      <source>Payload</source>
-      <translation type="unfinished">Payload</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/BuiltInPreFlightCheckModel.qml" line="75"/>
-      <source>Configured and started? Payload lid closed?</source>
-      <translation type="unfinished">Configured and started? Payload lid closed?</translation>
-    </message>
+    <name>CameraCalc</name>
     <message>
-      <location filename="../src/FlightDisplay/BuiltInPreFlightCheckModel.qml" line="80"/>
-      <source>OK for your platform? Lauching into the wind?</source>
-      <translation type="unfinished">OK for your platform? Lauching into the wind?</translation>
+      <location filename="../src/MissionManager/CameraCalc.cc" line="225"/>
+      <source>CameraCalc section version %1 not supported</source>
+      <translation type="unfinished">CameraCalc section version %1 not supported</translation>
     </message>
     <message>
-      <location filename="../src/FlightDisplay/BuiltInPreFlightCheckModel.qml" line="84"/>
-      <source>Flight area</source>
-      <translation type="unfinished">Flight area</translation>
+      <location filename="../src/MissionManager/CameraCalc.cc" line="279"/>
+      <source>Custom Camera</source>
+      <translation type="unfinished">Custom Camera</translation>
     </message>
     <message>
-      <location filename="../src/FlightDisplay/BuiltInPreFlightCheckModel.qml" line="85"/>
-      <source>Launch area and path free of obstacles/people?</source>
-      <translation type="unfinished">Launch area and path free of obstacles/people?</translation>
+      <location filename="../src/MissionManager/CameraCalc.cc" line="284"/>
+      <source>Manual (no camera specs)</source>
+      <translation type="unfinished">Manual (no camera specs)</translation>
     </message>
   </context>
   <context>
-    <name>CameraCalc</name>
-    <message>
-      <location filename="../src/PlanView/CameraCalc.qml" line="75"/>
-      <source>Camera</source>
-      <translation type="unfinished">Camera</translation>
-    </message>
+    <name>CameraCalcCamera</name>
     <message>
-      <location filename="../src/PlanView/CameraCalc.qml" line="136"/>
+      <location filename="../src/PlanView/CameraCalcCamera.qml" line="120"/>
       <source>Width</source>
       <translation type="unfinished">Width</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/CameraCalc.qml" line="140"/>
+      <location filename="../src/PlanView/CameraCalcCamera.qml" line="124"/>
       <source>Height</source>
       <translation type="unfinished">Height</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/CameraCalc.qml" line="148"/>
+      <location filename="../src/PlanView/CameraCalcCamera.qml" line="132"/>
       <source>Sensor</source>
       <translation type="unfinished">Sensor</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/CameraCalc.qml" line="163"/>
+      <location filename="../src/PlanView/CameraCalcCamera.qml" line="147"/>
       <source>Image</source>
       <translation type="unfinished">Image</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/CameraCalc.qml" line="179"/>
+      <location filename="../src/PlanView/CameraCalcCamera.qml" line="163"/>
       <source>Focal length</source>
       <translation type="unfinished">Focal length</translation>
     </message>
+  </context>
+  <context>
+    <name>CameraCalcGrid</name>
     <message>
-      <location filename="../src/PlanView/CameraCalc.qml" line="198"/>
+      <location filename="../src/PlanView/CameraCalcGrid.qml" line="51"/>
       <source>Front Lap</source>
       <translation type="unfinished">Front Lap</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/CameraCalc.qml" line="202"/>
+      <location filename="../src/PlanView/CameraCalcGrid.qml" line="55"/>
       <source>Side Lap</source>
       <translation type="unfinished">Side Lap</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/CameraCalc.qml" line="211"/>
+      <location filename="../src/PlanView/CameraCalcGrid.qml" line="63"/>
       <source>Overlap</source>
       <translation type="unfinished">Overlap</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/CameraCalc.qml" line="224"/>
+      <location filename="../src/PlanView/CameraCalcGrid.qml" line="76"/>
       <source>Select one:</source>
       <translation type="unfinished">Select one:</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/CameraCalc.qml" line="254"/>
-      <source>Ground Res</source>
-      <translation type="unfinished">Ground Res</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/CameraCalc.cc" line="226"/>
-      <source>CameraCalc section version %1 not supported</source>
-      <translation type="unfinished">CameraCalc section version %1 not supported</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/CameraCalc.cc" line="302"/>
-      <source>Custom Camera</source>
-      <translation type="unfinished">Custom Camera</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/CameraCalc.cc" line="307"/>
-      <source>Manual (no camera specs)</source>
-      <translation type="unfinished">Manual (no camera specs)</translation>
+      <location filename="../src/PlanView/CameraCalcGrid.qml" line="107"/>
+      <source>Grnd Res</source>
+      <translation type="unfinished">Grnd Res</translation>
     </message>
   </context>
   <context>
@@ -4331,127 +4573,142 @@ Blue Robotics thrusters are lubricated by water and are not designed to be run i
   <context>
     <name>CameraPageWidget</name>
     <message>
-      <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="53"/>
+      <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="56"/>
       <source>Video Settings</source>
       <translation type="unfinished">Video Settings</translation>
     </message>
     <message>
-      <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="53"/>
+      <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="56"/>
       <source>Camera Settings</source>
       <translation type="unfinished">Camera Settings</translation>
     </message>
     <message>
-      <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="59"/>
+      <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="62"/>
       <source>Trigger Camera</source>
       <translation type="unfinished">Trigger Camera</translation>
     </message>
     <message>
-      <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="68"/>
+      <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="71"/>
       <source>Camera</source>
       <translation type="unfinished">Camera</translation>
     </message>
     <message>
-      <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="74"/>
+      <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="77"/>
       <source>Free Space: </source>
       <translation type="unfinished">Free Space: </translation>
     </message>
     <message>
-      <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="214"/>
+      <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="83"/>
+      <source>Battery: </source>
+      <translation type="unfinished">Battery: </translation>
+    </message>
+    <message>
+      <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="225"/>
       <source>Camera Selector:</source>
       <translation type="unfinished">Camera Selector:</translation>
     </message>
     <message>
-      <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="233"/>
+      <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="244"/>
       <source>Stream Selector:</source>
       <translation type="unfinished">Stream Selector:</translation>
     </message>
     <message>
-      <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="250"/>
+      <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="261"/>
       <source>Off</source>
       <translation type="unfinished">Off</translation>
     </message>
     <message>
-      <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="250"/>
+      <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="261"/>
       <source>Blend</source>
       <translation type="unfinished">Blend</translation>
     </message>
     <message>
-      <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="250"/>
+      <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="261"/>
       <source>Full</source>
       <translation type="unfinished">Full</translation>
     </message>
     <message>
-      <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="250"/>
+      <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="261"/>
       <source>Picture In Picture</source>
       <translation type="unfinished">Picture In Picture</translation>
     </message>
     <message>
-      <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="252"/>
+      <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="263"/>
       <source>Thermal View Mode</source>
       <translation type="unfinished">Thermal View Mode</translation>
     </message>
     <message>
-      <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="270"/>
+      <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="281"/>
       <source>Blend Opacity</source>
       <translation type="unfinished">Blend Opacity</translation>
     </message>
     <message>
-      <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="350"/>
+      <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="361"/>
       <source>Single</source>
       <translation type="unfinished">Single</translation>
     </message>
     <message>
-      <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="350"/>
+      <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="361"/>
       <source>Time Lapse</source>
       <translation type="unfinished">Time Lapse</translation>
     </message>
     <message>
-      <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="352"/>
+      <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="363"/>
       <source>Photo Mode</source>
       <translation type="unfinished">Photo Mode</translation>
     </message>
     <message>
-      <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="371"/>
+      <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="382"/>
       <source>Photo Interval (seconds)</source>
       <translation type="unfinished">Photo Interval (seconds)</translation>
     </message>
     <message>
-      <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="398"/>
+      <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="410"/>
+      <source>Grid Lines</source>
+      <translation type="unfinished">Grid Lines</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="435"/>
+      <source>Video Screen Fit</source>
+      <translation type="unfinished">Video Screen Fit</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="452"/>
       <source>Reset Camera Defaults</source>
       <translation type="unfinished">Reset Camera Defaults</translation>
     </message>
     <message>
-      <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="403"/>
+      <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="457"/>
       <source>Reset</source>
       <translation type="unfinished">Reset</translation>
     </message>
     <message>
-      <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="409"/>
+      <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="463"/>
       <source>Reset Camera to Factory Settings</source>
       <translation type="unfinished">Reset Camera to Factory Settings</translation>
     </message>
     <message>
-      <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="410"/>
+      <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="464"/>
       <source>Confirm resetting all settings?</source>
       <translation type="unfinished">Confirm resetting all settings?</translation>
     </message>
     <message>
-      <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="426"/>
+      <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="480"/>
       <source>Storage</source>
       <translation type="unfinished">Storage</translation>
     </message>
     <message>
-      <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="431"/>
+      <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="485"/>
       <source>Format</source>
       <translation type="unfinished">Format</translation>
     </message>
     <message>
-      <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="437"/>
+      <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="491"/>
       <source>Format Camera Storage</source>
       <translation type="unfinished">Format Camera Storage</translation>
     </message>
     <message>
-      <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="438"/>
+      <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="492"/>
       <source>Confirm erasing all files?</source>
       <translation type="unfinished">Confirm erasing all files?</translation>
     </message>
@@ -4459,37 +4716,37 @@ Blue Robotics thrusters are lubricated by water and are not designed to be run i
   <context>
     <name>CameraSection</name>
     <message>
-      <location filename="../src/PlanView/CameraSection.qml" line="27"/>
+      <location filename="../src/PlanView/CameraSection.qml" line="29"/>
       <source>Camera</source>
       <translation type="unfinished">Camera</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/CameraSection.qml" line="52"/>
+      <location filename="../src/PlanView/CameraSection.qml" line="54"/>
       <source>Time</source>
       <translation type="unfinished">Time</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/CameraSection.qml" line="68"/>
+      <location filename="../src/PlanView/CameraSection.qml" line="70"/>
       <source>Distance</source>
       <translation type="unfinished">Distance</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/CameraSection.qml" line="85"/>
+      <location filename="../src/PlanView/CameraSection.qml" line="87"/>
       <source>Mode</source>
       <translation type="unfinished">Mode</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/CameraSection.qml" line="105"/>
+      <location filename="../src/PlanView/CameraSection.qml" line="107"/>
       <source>Pitch</source>
       <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/CameraSection.qml" line="106"/>
+      <location filename="../src/PlanView/CameraSection.qml" line="108"/>
       <source>Yaw</source>
       <translation type="unfinished">Yaw</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/CameraSection.qml" line="110"/>
+      <location filename="../src/PlanView/CameraSection.qml" line="106"/>
       <source>Gimbal</source>
       <translation type="unfinished">Gimbal</translation>
     </message>
@@ -4513,8 +4770,8 @@ Blue Robotics thrusters are lubricated by water and are not designed to be run i
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/CenterMapDropButton.qml" line="189"/>
-      <source>Home</source>
-      <translation type="unfinished">Home</translation>
+      <source>Launch</source>
+      <translation type="unfinished">Launch</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/CenterMapDropButton.qml" line="200"/>
@@ -4556,8 +4813,8 @@ Blue Robotics thrusters are lubricated by water and are not designed to be run i
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/CenterMapDropPanel.qml" line="54"/>
-      <source>Home</source>
-      <translation type="unfinished">Home</translation>
+      <source>Launch</source>
+      <translation type="unfinished">Launch</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/CenterMapDropPanel.qml" line="64"/>
@@ -4578,11 +4835,16 @@ Blue Robotics thrusters are lubricated by water and are not designed to be run i
   <context>
     <name>ComplexMissionItem</name>
     <message>
-      <location filename="../src/MissionManager/ComplexMissionItem.cc" line="55"/>
-      <location filename="../src/MissionManager/ComplexMissionItem.cc" line="61"/>
+      <location filename="../src/MissionManager/ComplexMissionItem.cc" line="53"/>
+      <location filename="../src/MissionManager/ComplexMissionItem.cc" line="59"/>
       <source>This Pattern does not support Presets.</source>
       <translation type="unfinished">This Pattern does not support Presets.</translation>
     </message>
+    <message>
+      <location filename="../src/MissionManager/ComplexMissionItem.cc" line="65"/>
+      <source>&apos;%1&apos; is a built-in preset which cannot be deleted.</source>
+      <translation type="unfinished">&apos;%1&apos; is a built-in preset which cannot be deleted.</translation>
+    </message>
   </context>
   <context>
     <name>ComplianceRules</name>
@@ -4595,23 +4857,23 @@ Blue Robotics thrusters are lubricated by water and are not designed to be run i
   <context>
     <name>CorridorScanComplexItem</name>
     <message>
-      <location filename="../src/MissionManager/CorridorScanComplexItem.cc" line="104"/>
+      <location filename="../src/MissionManager/CorridorScanComplexItem.cc" line="107"/>
       <source>%1 does not support loading this complex mission item type: %2:%3</source>
       <translation type="unfinished">%1 does not support loading this complex mission item type: %2:%3</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/CorridorScanComplexItem.cc" line="111"/>
+      <location filename="../src/MissionManager/CorridorScanComplexItem.cc" line="114"/>
       <source>%1 complex item version %2 not supported</source>
       <translation type="unfinished">%1 complex item version %2 not supported</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/CorridorScanComplexItem.h" line="51"/>
-      <location filename="../src/MissionManager/CorridorScanComplexItem.h" line="52"/>
+      <location filename="../src/MissionManager/CorridorScanComplexItem.h" line="49"/>
+      <location filename="../src/MissionManager/CorridorScanComplexItem.h" line="50"/>
       <source>Corridor Scan</source>
       <translation type="unfinished">Corridor Scan</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/CorridorScanComplexItem.h" line="53"/>
+      <location filename="../src/MissionManager/CorridorScanComplexItem.h" line="51"/>
       <source>C</source>
       <translation type="unfinished">C</translation>
     </message>
@@ -4619,82 +4881,97 @@ Blue Robotics thrusters are lubricated by water and are not designed to be run i
   <context>
     <name>CorridorScanEditor</name>
     <message>
-      <location filename="../src/PlanView/CorridorScanEditor.qml" line="62"/>
+      <location filename="../src/PlanView/CorridorScanEditor.qml" line="112"/>
       <source>WARNING: Photo interval is below minimum interval (%1 secs) supported by camera.</source>
       <translation type="unfinished">WARNING: Photo interval is below minimum interval (%1 secs) supported by camera.</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/CorridorScanEditor.qml" line="72"/>
+      <location filename="../src/PlanView/CorridorScanEditor.qml" line="122"/>
       <source>Altitude</source>
       <translation type="unfinished">Altitude</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/CorridorScanEditor.qml" line="74"/>
+      <location filename="../src/PlanView/CorridorScanEditor.qml" line="126"/>
       <source>Trigger Dist</source>
       <translation type="unfinished">Trigger Dist</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/CorridorScanEditor.qml" line="75"/>
+      <location filename="../src/PlanView/CorridorScanEditor.qml" line="127"/>
       <source>Spacing</source>
       <translation type="unfinished">Spacing</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/CorridorScanEditor.qml" line="80"/>
+      <location filename="../src/PlanView/CorridorScanEditor.qml" line="134"/>
       <source>Corridor</source>
       <translation type="unfinished">Corridor</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/CorridorScanEditor.qml" line="91"/>
+      <location filename="../src/PlanView/CorridorScanEditor.qml" line="145"/>
       <source>Width</source>
       <translation type="unfinished">Width</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/CorridorScanEditor.qml" line="97"/>
+      <location filename="../src/PlanView/CorridorScanEditor.qml" line="151"/>
       <source>Turnaround dist</source>
       <translation type="unfinished">Turnaround dist</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/CorridorScanEditor.qml" line="104"/>
-      <source>Take images in turnarounds</source>
-      <translation type="unfinished">Take images in turnarounds</translation>
+      <location filename="../src/PlanView/CorridorScanEditor.qml" line="68"/>
+      <source>Use the Polyline Tools to create the polyline which defines the corridor.</source>
+      <translation type="unfinished">Use the Polyline Tools to create the polyline which defines the corridor.</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/CorridorScanEditor.qml" line="112"/>
+      <location filename="../src/PlanView/CorridorScanEditor.qml" line="99"/>
+      <source>Grid</source>
+      <translation type="unfinished">Grid</translation>
+    </message>
+    <message>
+      <location filename="../src/PlanView/CorridorScanEditor.qml" line="100"/>
+      <source>Camera</source>
+      <translation type="unfinished">Camera</translation>
+    </message>
+    <message>
+      <location filename="../src/PlanView/CorridorScanEditor.qml" line="163"/>
+      <source>Images in turnarounds</source>
+      <translation type="unfinished">Images in turnarounds</translation>
+    </message>
+    <message>
+      <location filename="../src/PlanView/CorridorScanEditor.qml" line="169"/>
       <source>Relative altitude</source>
       <translation type="unfinished">Relative altitude</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/CorridorScanEditor.qml" line="128"/>
+      <location filename="../src/PlanView/CorridorScanEditor.qml" line="186"/>
       <source>Rotate Entry Point</source>
       <translation type="unfinished">Rotate Entry Point</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/CorridorScanEditor.qml" line="134"/>
+      <location filename="../src/PlanView/CorridorScanEditor.qml" line="194"/>
       <source>Terrain</source>
       <translation type="unfinished">Terrain</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/CorridorScanEditor.qml" line="146"/>
+      <location filename="../src/PlanView/CorridorScanEditor.qml" line="206"/>
       <source>Vehicle follows terrain</source>
       <translation type="unfinished">Vehicle follows terrain</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/CorridorScanEditor.qml" line="158"/>
+      <location filename="../src/PlanView/CorridorScanEditor.qml" line="218"/>
       <source>Tolerance</source>
       <translation type="unfinished">Tolerance</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/CorridorScanEditor.qml" line="164"/>
+      <location filename="../src/PlanView/CorridorScanEditor.qml" line="224"/>
       <source>Max Climb Rate</source>
       <translation type="unfinished">Max Climb Rate</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/CorridorScanEditor.qml" line="170"/>
+      <location filename="../src/PlanView/CorridorScanEditor.qml" line="230"/>
       <source>Max Descent Rate</source>
       <translation type="unfinished">Max Descent Rate</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/CorridorScanEditor.qml" line="180"/>
+      <location filename="../src/PlanView/CorridorScanEditor.qml" line="242"/>
       <source>Statistics</source>
       <translation type="unfinished">Statistics</translation>
     </message>
@@ -4717,19 +4994,6 @@ Blue Robotics thrusters are lubricated by water and are not designed to be run i
       <translation type="unfinished">Reset</translation>
     </message>
   </context>
-  <context>
-    <name>CustomCommandWidgetController</name>
-    <message>
-      <location filename="../src/ViewWidgets/CustomCommandWidgetController.cc" line="48"/>
-      <source>Select custom Qml file</source>
-      <translation type="unfinished">Select custom Qml file</translation>
-    </message>
-    <message>
-      <location filename="../src/ViewWidgets/CustomCommandWidgetController.cc" line="48"/>
-      <source>Qml files (*.qml)</source>
-      <translation type="unfinished">Qml files (*.qml)</translation>
-    </message>
-  </context>
   <context>
     <name>DebugWindow</name>
     <message>
@@ -4883,6 +5147,94 @@ Blue Robotics thrusters are lubricated by water and are not designed to be run i
       <translation type="unfinished">Font Point Size 17</translation>
     </message>
   </context>
+  <context>
+    <name>DefaultChecklist</name>
+    <message>
+      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="25"/>
+      <source>Generic Initial checks</source>
+      <translation type="unfinished">Generic Initial checks</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="28"/>
+      <source>Hardware</source>
+      <translation type="unfinished">Hardware</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="29"/>
+      <source>Props mounted? Wings secured? Tail secured?</source>
+      <translation type="unfinished">Props mounted? Wings secured? Tail secured?</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="50"/>
+      <source>Please arm the vehicle here</source>
+      <translation type="unfinished">Please arm the vehicle here</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="53"/>
+      <source>Actuators</source>
+      <translation type="unfinished">Actuators</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="54"/>
+      <source>Move all control surfaces. Did they work properly?</source>
+      <translation type="unfinished">Move all control surfaces. Did they work properly?</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="58"/>
+      <source>Motors</source>
+      <translation type="unfinished">Motors</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="59"/>
+      <source>Propellers free? Then throttle up gently. Working properly?</source>
+      <translation type="unfinished">Propellers free? Then throttle up gently. Working properly?</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="63"/>
+      <source>Mission</source>
+      <translation type="unfinished">Mission</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="64"/>
+      <source>Please confirm mission is valid (waypoints valid, no terrain collision).</source>
+      <translation type="unfinished">Please confirm mission is valid (waypoints valid, no terrain collision).</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="72"/>
+      <source>Last preparations before launch</source>
+      <translation type="unfinished">Last preparations before launch</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="76"/>
+      <source>Payload</source>
+      <translation type="unfinished">Payload</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="77"/>
+      <source>Configured and started? Payload lid closed?</source>
+      <translation type="unfinished">Configured and started? Payload lid closed?</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="81"/>
+      <source>Wind &amp; weather</source>
+      <translation type="unfinished">Wind &amp; weather</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="82"/>
+      <source>OK for your platform? Lauching into the wind?</source>
+      <translation type="unfinished">OK for your platform? Lauching into the wind?</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="86"/>
+      <source>Flight area</source>
+      <translation type="unfinished">Flight area</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="87"/>
+      <source>Launch area and path free of obstacles/people?</source>
+      <translation type="unfinished">Launch area and path free of obstacles/people?</translation>
+    </message>
+  </context>
   <context>
     <name>ESP8266Component</name>
     <message>
@@ -5053,51 +5405,69 @@ Blue Robotics thrusters are lubricated by water and are not designed to be run i
   <context>
     <name>EditPositionDialog</name>
     <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="50"/>
+      <location filename="../src/QmlControls/EditPositionDialog.qml" line="51"/>
       <source>Latitude</source>
       <translation type="unfinished">Latitude</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="56"/>
+      <location filename="../src/QmlControls/EditPositionDialog.qml" line="59"/>
       <source>Longitude</source>
       <translation type="unfinished">Longitude</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="65"/>
+      <location filename="../src/QmlControls/EditPositionDialog.qml" line="67"/>
       <source>Set Geographic</source>
       <translation type="unfinished">Set Geographic</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="80"/>
+      <location filename="../src/QmlControls/EditPositionDialog.qml" line="79"/>
       <source>Zone</source>
       <translation type="unfinished">Zone</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="86"/>
+      <location filename="../src/QmlControls/EditPositionDialog.qml" line="87"/>
       <source>Hemisphere</source>
       <translation type="unfinished">Hemisphere</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="93"/>
+      <location filename="../src/QmlControls/EditPositionDialog.qml" line="96"/>
       <source>Easting</source>
       <translation type="unfinished">Easting</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="99"/>
+      <location filename="../src/QmlControls/EditPositionDialog.qml" line="104"/>
       <source>Northing</source>
       <translation type="unfinished">Northing</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="108"/>
+      <location filename="../src/QmlControls/EditPositionDialog.qml" line="112"/>
       <source>Set UTM</source>
       <translation type="unfinished">Set UTM</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="118"/>
+      <location filename="../src/QmlControls/EditPositionDialog.qml" line="124"/>
+      <source>MGRS</source>
+      <translation type="unfinished">MGRS</translation>
+    </message>
+    <message>
+      <location filename="../src/QmlControls/EditPositionDialog.qml" line="132"/>
+      <source>Set MGRS</source>
+      <translation type="unfinished">Set MGRS</translation>
+    </message>
+    <message>
+      <location filename="../src/QmlControls/EditPositionDialog.qml" line="144"/>
       <source>Set From Vehicle Position</source>
       <translation type="unfinished">Set From Vehicle Position</translation>
     </message>
   </context>
+  <context>
+    <name>ExitWithErrorWindow</name>
+    <message>
+      <location filename="../src/ui/ExitWithErrorWindow.qml" line="47"/>
+      <source>Close</source>
+      <translation type="unfinished">Close</translation>
+    </message>
+  </context>
   <context>
     <name>FWLandingPatternEditor</name>
     <message>
@@ -5111,81 +5481,124 @@ Blue Robotics thrusters are lubricated by water and are not designed to be run i
       <translation type="unfinished">Set to vehicle location</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="56"/>
+      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="58"/>
       <source>Loiter point</source>
       <translation type="unfinished">Loiter point</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="72"/>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="128"/>
+      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="74"/>
+      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="132"/>
       <source>Altitude</source>
       <translation type="unfinished">Altitude</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="80"/>
+      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="82"/>
       <source>Radius</source>
       <translation type="unfinished">Radius</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="91"/>
+      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="93"/>
       <source>Loiter clockwise</source>
       <translation type="unfinished">Loiter clockwise</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="105"/>
+      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="109"/>
       <source>Landing point</source>
       <translation type="unfinished">Landing point</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="121"/>
+      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="125"/>
       <source>Heading</source>
       <translation type="unfinished">Heading</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="138"/>
+      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="142"/>
       <source>Landing Dist</source>
       <translation type="unfinished">Landing Dist</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="152"/>
+      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="156"/>
       <source>Glide Slope</source>
       <translation type="unfinished">Glide Slope</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="177"/>
-      <source>Altitudes relative to home</source>
-      <translation type="unfinished">Altitudes relative to home</translation>
+      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="181"/>
+      <source>Altitudes relative to launch</source>
+      <translation type="unfinished">Altitudes relative to launch</translation>
+    </message>
+    <message>
+      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="311"/>
+      <source>Drag the loiter point to adjust landing direction for wind and obstacles.</source>
+      <translation type="unfinished">Drag the loiter point to adjust landing direction for wind and obstacles.</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="185"/>
+      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="315"/>
+      <source>Done</source>
+      <translation type="unfinished">Done</translation>
+    </message>
+    <message>
+      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="191"/>
       <source>Camera</source>
       <translation type="unfinished">Camera</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="227"/>
+      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="229"/>
+      <source>* Approximate glide slope altitudes.</source>
+      <translation type="unfinished">* Approximate glide slope altitudes.</translation>
+    </message>
+    <message>
+      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="238"/>
+      <source>* Actual flight path will vary.</source>
+      <translation type="unfinished">* Actual flight path will vary.</translation>
+    </message>
+    <message>
+      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="247"/>
+      <source>* Avoid tailwind on landing.</source>
+      <translation type="unfinished">* Avoid tailwind on landing.</translation>
+    </message>
+    <message>
+      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="273"/>
       <source>Click in map to set landing point.</source>
       <translation type="unfinished">Click in map to set landing point.</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="234"/>
+      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="280"/>
       <source>- or -</source>
       <translation type="unfinished">- or -</translation>
     </message>
   </context>
   <context>
-    <name>Fact</name>
+    <name>FWLandingPatternMapVisual</name>
     <message>
-      <location filename="../src/FactSystem/Fact.cc" line="247"/>
-      <source>Unknown: %1</source>
-      <translation type="unfinished">Unknown: %1</translation>
+      <location filename="../src/PlanView/FWLandingPatternMapVisual.qml" line="261"/>
+      <source>Loiter</source>
+      <translation type="unfinished">Loiter</translation>
     </message>
     <message>
-      <location filename="../src/FactSystem/Fact.cc" line="332"/>
-      <source>true</source>
-      <translation type="unfinished">true</translation>
+      <location filename="../src/PlanView/FWLandingPatternMapVisual.qml" line="314"/>
+      <source>Landing Area</source>
+      <translation type="unfinished">Landing Area</translation>
     </message>
     <message>
-      <location filename="../src/FactSystem/Fact.cc" line="332"/>
+      <location filename="../src/PlanView/FWLandingPatternMapVisual.qml" line="351"/>
+      <source>Glide Slope</source>
+      <translation type="unfinished">Glide Slope</translation>
+    </message>
+  </context>
+  <context>
+    <name>Fact</name>
+    <message>
+      <location filename="../src/FactSystem/Fact.cc" line="247"/>
+      <source>Unknown: %1</source>
+      <translation type="unfinished">Unknown: %1</translation>
+    </message>
+    <message>
+      <location filename="../src/FactSystem/Fact.cc" line="332"/>
+      <source>true</source>
+      <translation type="unfinished">true</translation>
+    </message>
+    <message>
+      <location filename="../src/FactSystem/Fact.cc" line="332"/>
       <source>false</source>
       <translation type="unfinished">false</translation>
     </message>
@@ -5203,34 +5616,34 @@ Blue Robotics thrusters are lubricated by water and are not designed to be run i
   <context>
     <name>FactMetaData</name>
     <message>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="35"/>
+      <location filename="../src/FactSystem/FactMetaData.cc" line="40"/>
       <source>Other</source>
       <translation type="unfinished">Other</translation>
     </message>
     <message>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="36"/>
+      <location filename="../src/FactSystem/FactMetaData.cc" line="41"/>
       <source>Misc</source>
       <translation type="unfinished">Misc</translation>
     </message>
     <message>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="340"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="348"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="358"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="366"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="374"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="383"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="421"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="429"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="439"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="447"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="455"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="464"/>
+      <location filename="../src/FactSystem/FactMetaData.cc" line="353"/>
+      <location filename="../src/FactSystem/FactMetaData.cc" line="361"/>
+      <location filename="../src/FactSystem/FactMetaData.cc" line="371"/>
+      <location filename="../src/FactSystem/FactMetaData.cc" line="379"/>
+      <location filename="../src/FactSystem/FactMetaData.cc" line="387"/>
+      <location filename="../src/FactSystem/FactMetaData.cc" line="396"/>
+      <location filename="../src/FactSystem/FactMetaData.cc" line="441"/>
+      <location filename="../src/FactSystem/FactMetaData.cc" line="449"/>
+      <location filename="../src/FactSystem/FactMetaData.cc" line="459"/>
+      <location filename="../src/FactSystem/FactMetaData.cc" line="467"/>
+      <location filename="../src/FactSystem/FactMetaData.cc" line="475"/>
+      <location filename="../src/FactSystem/FactMetaData.cc" line="484"/>
       <source>Value must be within %1 and %2</source>
       <translation type="unfinished">Value must be within %1 and %2</translation>
     </message>
     <message>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="402"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="483"/>
+      <location filename="../src/FactSystem/FactMetaData.cc" line="415"/>
+      <location filename="../src/FactSystem/FactMetaData.cc" line="503"/>
       <source>Invalid number</source>
       <translation type="unfinished">Invalid number</translation>
     </message>
@@ -5238,7 +5651,7 @@ Blue Robotics thrusters are lubricated by water and are not designed to be run i
   <context>
     <name>FactPanelController</name>
     <message>
-      <location filename="../src/FactSystem/FactControls/FactPanelController.cc" line="113"/>
+      <location filename="../src/FactSystem/FactControls/FactPanelController.cc" line="121"/>
       <source>Internal Error: %1</source>
       <translation type="unfinished">Internal Error: %1</translation>
     </message>
@@ -5256,6 +5669,39 @@ Blue Robotics thrusters are lubricated by water and are not designed to be run i
       <translation type="unfinished">Value Details</translation>
     </message>
   </context>
+  <context>
+    <name>FactValueGrid</name>
+    <message>
+      <location filename="../src/QmlControls/FactValueGrid.cc" line="39"/>
+      <source>Default</source>
+      <translation type="unfinished">Default</translation>
+    </message>
+    <message>
+      <location filename="../src/QmlControls/FactValueGrid.cc" line="40"/>
+      <source>Small</source>
+      <translation type="unfinished">Small</translation>
+    </message>
+    <message>
+      <location filename="../src/QmlControls/FactValueGrid.cc" line="41"/>
+      <source>Medium</source>
+      <translation type="unfinished">Medium</translation>
+    </message>
+    <message>
+      <location filename="../src/QmlControls/FactValueGrid.cc" line="42"/>
+      <source>Large</source>
+      <translation type="unfinished">Large</translation>
+    </message>
+    <message>
+      <location filename="../src/QmlControls/FactValueGrid.cc" line="302"/>
+      <source>Settings version %1 for %2 is not supported. Setup will be reset to defaults.</source>
+      <translation type="unfinished">Settings version %1 for %2 is not supported. Setup will be reset to defaults.</translation>
+    </message>
+    <message>
+      <location filename="../src/QmlControls/FactValueGrid.cc" line="302"/>
+      <source>Load Settings</source>
+      <translation type="unfinished">Load Settings</translation>
+    </message>
+  </context>
   <context>
     <name>FactValueSlider</name>
     <message>
@@ -5501,129 +5947,139 @@ Blue Robotics thrusters are lubricated by water and are not designed to be run i
   <context>
     <name>FirmwarePlugin</name>
     <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="349"/>
+      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="345"/>
       <source>Canon S100 PowerShot</source>
       <translation type="unfinished">Canon S100 PowerShot</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="363"/>
+      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="359"/>
       <source>Canon EOS-M 22mm</source>
       <translation type="unfinished">Canon EOS-M 22mm</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="377"/>
+      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="373"/>
       <source>Canon G9 X PowerShot</source>
       <translation type="unfinished">Canon G9 X PowerShot</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="391"/>
+      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="387"/>
       <source>Canon SX260 HS PowerShot</source>
       <translation type="unfinished">Canon SX260 HS PowerShot</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="404"/>
+      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="400"/>
       <source>GoPro Hero 4</source>
       <translation type="unfinished">GoPro Hero 4</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="418"/>
+      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="414"/>
       <source>Parrot Sequioa RGB</source>
       <translation type="unfinished">Parrot Sequioa RGB</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="432"/>
+      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="428"/>
       <source>Parrot Sequioa Monochrome</source>
       <translation type="unfinished">Parrot Sequioa Monochrome</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="445"/>
+      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="441"/>
       <source>RedEdge</source>
       <translation type="unfinished">RedEdge</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="459"/>
+      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="455"/>
       <source>Ricoh GR II</source>
       <translation type="unfinished">Ricoh GR II</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="472"/>
+      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="468"/>
       <source>Sentera Double 4K Sensor</source>
       <translation type="unfinished">Sentera Double 4K Sensor</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="485"/>
+      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="481"/>
       <source>Sentera NDVI Single Sensor</source>
       <translation type="unfinished">Sentera NDVI Single Sensor</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="500"/>
+      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="496"/>
       <source>Sony a6000 16mm</source>
       <translation type="unfinished">Sony a6000 16mm</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="513"/>
+      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="509"/>
       <source>Sony a6300 Zeiss 21mm f/2.8</source>
       <translation type="unfinished">Sony a6300 Zeiss 21mm f/2.8</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="526"/>
+      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="522"/>
       <source>Sony a6300 Sony 28mm f/2.0</source>
       <translation type="unfinished">Sony a6300 Sony 28mm f/2.0</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="539"/>
+      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="535"/>
       <source>Sony a7R II Zeiss 21mm f/2.8</source>
       <translation type="unfinished">Sony a7R II Zeiss 21mm f/2.8</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="552"/>
+      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="548"/>
       <source>Sony a7R II Sony 28mm f/2.0</source>
       <translation type="unfinished">Sony a7R II Sony 28mm f/2.0</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="565"/>
+      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="561"/>
       <source>Sony DSC-QX30U @ 4.3mm f/3.5</source>
       <translation type="unfinished">Sony DSC-QX30U @ 4.3mm f/3.5</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="581"/>
+      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="574"/>
+      <source>Sony DSC-RX0</source>
+      <translation type="unfinished">Sony DSC-RX0</translation>
+    </message>
+    <message>
+      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="590"/>
       <source>Sony ILCE-QX1</source>
       <translation type="unfinished">Sony ILCE-QX1</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="596"/>
+      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="605"/>
       <source>Sony NEX-5R 20mm</source>
       <translation type="unfinished">Sony NEX-5R 20mm</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="610"/>
+      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="619"/>
       <source>Sony RX100 II 28mm</source>
       <translation type="unfinished">Sony RX100 II 28mm</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="623"/>
+      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="632"/>
       <source>Yuneec CGOET</source>
       <translation type="unfinished">Yuneec CGOET</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="636"/>
+      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="645"/>
       <source>Yuneec E10T</source>
       <translation type="unfinished">Yuneec E10T</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="649"/>
+      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="658"/>
       <source>Yuneec E50</source>
       <translation type="unfinished">Yuneec E50</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="662"/>
+      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="671"/>
       <source>Yuneec E90</source>
       <translation type="unfinished">Yuneec E90</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="857"/>
-      <source>Vehicle is not running latest stable firmware! Running %2-%1, latest stable is %3.</source>
-      <translation type="unfinished">Vehicle is not running latest stable firmware! Running %2-%1, latest stable is %3.</translation>
+      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="684"/>
+      <source>Flir Duo R</source>
+      <translation type="unfinished">Flir Duo R</translation>
+    </message>
+    <message>
+      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="887"/>
+      <source>Vehicle is not running latest stable firmware! Running %1, latest stable is %2.</source>
+      <translation type="unfinished">Vehicle is not running latest stable firmware! Running %1, latest stable is %2.</translation>
     </message>
   </context>
   <context>
@@ -5659,167 +6115,182 @@ Blue Robotics thrusters are lubricated by water and are not designed to be run i
       <translation type="unfinished">Upgrade cancelled</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="117"/>
+      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="84"/>
+      <source>Select Firmware File</source>
+      <translation type="unfinished">Select Firmware File</translation>
+    </message>
+    <message>
+      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="85"/>
+      <source>Firmware Files (*.px4 *.apj *.bin *.ihx)</source>
+      <translation type="unfinished">Firmware Files (*.px4 *.apj *.bin *.ihx)</translation>
+    </message>
+    <message>
+      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="85"/>
+      <source>All Files (*)</source>
+      <translation type="unfinished">All Files (*)</translation>
+    </message>
+    <message>
+      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="129"/>
       <source>Multiple devices detected! Remove all detected devices to perform the firmware upgrade.</source>
       <translation type="unfinished">Multiple devices detected! Remove all detected devices to perform the firmware upgrade.</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="118"/>
+      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="130"/>
       <source>Detected [%1]: </source>
       <translation type="unfinished">Detected [%1]: </translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="124"/>
+      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="137"/>
       <source>Found device</source>
       <translation type="unfinished">Found device</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="172"/>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="309"/>
+      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="184"/>
+      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="338"/>
       <source>PX4 Pro </source>
       <translation type="unfinished">PX4 Pro </translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="233"/>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="267"/>
+      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="249"/>
+      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="283"/>
       <source>Standard Version (stable)</source>
       <translation type="unfinished">Standard Version (stable)</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="237"/>
+      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="253"/>
       <source>Beta Testing (beta)</source>
       <translation type="unfinished">Beta Testing (beta)</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="241"/>
+      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="257"/>
       <source>Developer Build (master)</source>
       <translation type="unfinished">Developer Build (master)</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="245"/>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="271"/>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="284"/>
+      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="261"/>
+      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="287"/>
+      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="300"/>
       <source>Custom firmware file...</source>
       <translation type="unfinished">Custom firmware file...</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="254"/>
+      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="270"/>
       <source>PX4 Pro</source>
       <translation type="unfinished">PX4 Pro</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="258"/>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="322"/>
+      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="274"/>
+      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="351"/>
       <source>ArduPilot</source>
       <translation type="unfinished">ArduPilot</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="280"/>
+      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="296"/>
       <source>Standard Version</source>
       <translation type="unfinished">Standard Version</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="298"/>
+      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="320"/>
       <source>Detected PX4 Flow board. The firmware you use on the PX4 Flow must match the AutoPilot firmware type you are using on the vehicle:</source>
       <translation type="unfinished">Detected PX4 Flow board. The firmware you use on the PX4 Flow must match the AutoPilot firmware type you are using on the vehicle:</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="299"/>
+      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="321"/>
       <source>Detected Pixhawk board. You can select from the following flight stacks:</source>
       <translation type="unfinished">Detected Pixhawk board. You can select from the following flight stacks:</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="300"/>
+      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="322"/>
       <source>Press Ok to upgrade your vehicle.</source>
       <translation type="unfinished">Press Ok to upgrade your vehicle.</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="303"/>
+      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="325"/>
       <source>Flight Stack</source>
       <translation type="unfinished">Flight Stack</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="365"/>
+      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="393"/>
       <source>Downloading list of available firmwares...</source>
       <translation type="unfinished">Downloading list of available firmwares...</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="373"/>
+      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="401"/>
       <source>No Firmware Available</source>
       <translation type="unfinished">No Firmware Available</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="400"/>
+      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="429"/>
       <source>Advanced settings</source>
       <translation type="unfinished">Advanced settings</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="422"/>
+      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="451"/>
       <source>Select the standard version or one from the file system (previously downloaded):</source>
       <translation type="unfinished">Select the standard version or one from the file system (previously downloaded):</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="422"/>
+      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="452"/>
       <source>Select which version of the firmware you would like to install:</source>
       <translation type="unfinished">Select which version of the firmware you would like to install:</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="422"/>
+      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="453"/>
       <source>Select which version of the above flight stack you would like to install:</source>
       <translation type="unfinished">Select which version of the above flight stack you would like to install:</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="437"/>
+      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="469"/>
       <source>WARNING: BETA FIRMWARE. </source>
       <translation type="unfinished">WARNING: BETA FIRMWARE. </translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="438"/>
+      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="470"/>
       <source>This firmware version is ONLY intended for beta testers. </source>
       <translation type="unfinished">This firmware version is ONLY intended for beta testers. </translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="439"/>
+      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="471"/>
       <source>Although it has received FLIGHT TESTING, it represents actively changed code. </source>
       <translation type="unfinished">Although it has received FLIGHT TESTING, it represents actively changed code. </translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="440"/>
+      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="472"/>
       <source>Do NOT use for normal operation.</source>
       <translation type="unfinished">Do NOT use for normal operation.</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="443"/>
+      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="475"/>
       <source>WARNING: CONTINUOUS BUILD FIRMWARE. </source>
       <translation type="unfinished">WARNING: CONTINUOUS BUILD FIRMWARE. </translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="444"/>
+      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="476"/>
       <source>This firmware has NOT BEEN FLIGHT TESTED. </source>
       <translation type="unfinished">This firmware has NOT BEEN FLIGHT TESTED. </translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="445"/>
+      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="477"/>
       <source>It is only intended for DEVELOPERS. </source>
       <translation type="unfinished">It is only intended for DEVELOPERS. </translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="446"/>
+      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="478"/>
       <source>Run bench tests without props first. </source>
       <translation type="unfinished">Run bench tests without props first. </translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="447"/>
+      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="479"/>
       <source>Do NOT fly this without additional safety precautions. </source>
       <translation type="unfinished">Do NOT fly this without additional safety precautions. </translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="448"/>
+      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="480"/>
       <source>Follow the mailing list actively when using it.</source>
       <translation type="unfinished">Follow the mailing list actively when using it.</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="487"/>
+      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="520"/>
       <source>Flash ChibiOS Bootloader</source>
       <translation type="unfinished">Flash ChibiOS Bootloader</translation>
     </message>
@@ -5827,100 +6298,193 @@ Blue Robotics thrusters are lubricated by water and are not designed to be run i
   <context>
     <name>FirmwareUpgradeController</name>
     <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="113"/>
+      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="118"/>
       <source>Connect not allowed during Firmware Upgrade.</source>
       <translation type="unfinished">Connect not allowed during Firmware Upgrade.</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="231"/>
+      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="236"/>
       <source>Connected to bootloader:</source>
       <translation type="unfinished">Connected to bootloader:</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="232"/>
+      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="237"/>
       <source>  Version: %1</source>
       <translation type="unfinished">  Version: %1</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="233"/>
+      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="238"/>
       <source>  Board ID: %1</source>
       <translation type="unfinished">  Board ID: %1</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="234"/>
+      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="239"/>
       <source>  Flash size: %1</source>
       <translation type="unfinished">  Flash size: %1</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="495"/>
+      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="555"/>
+      <source>Custom firmware selected but no filename given.</source>
+      <translation type="unfinished">Custom firmware selected but no filename given.</translation>
+    </message>
+    <message>
+      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="560"/>
       <source>Unable to find specified firmware for board type</source>
       <translation type="unfinished">Unable to find specified firmware for board type</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="501"/>
+      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="566"/>
       <source>No firmware file selected</source>
       <translation type="unfinished">No firmware file selected</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="512"/>
+      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="577"/>
       <source>Downloading firmware...</source>
       <translation type="unfinished">Downloading firmware...</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="513"/>
+      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="578"/>
       <source> From: %1</source>
       <translation type="unfinished"> From: %1</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="536"/>
+      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="601"/>
       <source>Download complete</source>
       <translation type="unfinished">Download complete</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="544"/>
+      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="609"/>
       <source>Image load failed</source>
       <translation type="unfinished">Image load failed</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="550"/>
+      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="615"/>
       <source>Bootloader not found</source>
       <translation type="unfinished">Bootloader not found</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="555"/>
+      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="620"/>
       <source>Image size of %1 is too large for board flash size %2</source>
       <translation type="unfinished">Image size of %1 is too large for board flash size %2</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="590"/>
+      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="655"/>
       <source>Upgrade complete</source>
       <translation type="unfinished">Upgrade complete</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="648"/>
+      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="713"/>
       <source>Upgrade cancelled</source>
       <translation type="unfinished">Upgrade cancelled</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="715"/>
+      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="786"/>
       <source>Choose board type</source>
       <translation type="unfinished">Choose board type</translation>
     </message>
   </context>
+  <context>
+    <name>FixedWingChecklist</name>
+    <message>
+      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="25"/>
+      <source>Fixed Wing Initial Checks</source>
+      <translation type="unfinished">Fixed Wing Initial Checks</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="28"/>
+      <source>Hardware</source>
+      <translation type="unfinished">Hardware</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="29"/>
+      <source>Props mounted? Wings secured? Tail secured?</source>
+      <translation type="unfinished">Props mounted? Wings secured? Tail secured?</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="50"/>
+      <source>Please arm the vehicle here</source>
+      <translation type="unfinished">Please arm the vehicle here</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="53"/>
+      <source>Actuators</source>
+      <translation type="unfinished">Actuators</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="54"/>
+      <source>Move all control surfaces. Did they work properly?</source>
+      <translation type="unfinished">Move all control surfaces. Did they work properly?</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="58"/>
+      <source>Motors</source>
+      <translation type="unfinished">Motors</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="59"/>
+      <source>Propellers free? Then throttle up gently. Working properly?</source>
+      <translation type="unfinished">Propellers free? Then throttle up gently. Working properly?</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="63"/>
+      <source>Mission</source>
+      <translation type="unfinished">Mission</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="64"/>
+      <source>Please confirm mission is valid (waypoints valid, no terrain collision).</source>
+      <translation type="unfinished">Please confirm mission is valid (waypoints valid, no terrain collision).</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="72"/>
+      <source>Last preparations before launch</source>
+      <translation type="unfinished">Last preparations before launch</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="76"/>
+      <source>Payload</source>
+      <translation type="unfinished">Payload</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="77"/>
+      <source>Configured and started? Payload lid closed?</source>
+      <translation type="unfinished">Configured and started? Payload lid closed?</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="81"/>
+      <source>Wind &amp; weather</source>
+      <translation type="unfinished">Wind &amp; weather</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="82"/>
+      <source>OK for your platform? Lauching into the wind?</source>
+      <translation type="unfinished">OK for your platform? Lauching into the wind?</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="86"/>
+      <source>Flight area</source>
+      <translation type="unfinished">Flight area</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="87"/>
+      <source>Launch area and path free of obstacles/people?</source>
+      <translation type="unfinished">Launch area and path free of obstacles/people?</translation>
+    </message>
+  </context>
   <context>
     <name>FixedWingLandingComplexItem</name>
     <message>
-      <location filename="../src/MissionManager/FixedWingLandingComplexItem.cc" line="194"/>
+      <location filename="../src/MissionManager/FixedWingLandingComplexItem.cc" line="212"/>
       <source>%1 does not support loading this complex mission item type: %2:%3</source>
       <translation type="unfinished">%1 does not support loading this complex mission item type: %2:%3</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/FixedWingLandingComplexItem.cc" line="215"/>
+      <location filename="../src/MissionManager/FixedWingLandingComplexItem.cc" line="233"/>
       <source>Fixed Wing Landing Pattern: Setting the loiter and landing altitudes with different settings for altitude relative is no longer supported. Both have been set to altitude relative. Be sure to adjust/check your plan prior to flight.</source>
       <translation type="unfinished">Fixed Wing Landing Pattern: Setting the loiter and landing altitudes with different settings for altitude relative is no longer supported. Both have been set to altitude relative. Be sure to adjust/check your plan prior to flight.</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/FixedWingLandingComplexItem.cc" line="236"/>
+      <location filename="../src/MissionManager/FixedWingLandingComplexItem.cc" line="254"/>
       <source>%1 complex item version %2 not supported</source>
       <translation type="unfinished">%1 complex item version %2 not supported</translation>
     </message>
@@ -6046,131 +6610,19 @@ Blue Robotics thrusters are lubricated by water and are not designed to be run i
       <translation type="unfinished">Flight Context</translation>
     </message>
   </context>
-  <context>
-    <name>FlightDisplayView</name>
-    <message>
-      <location filename="../src/FlightDisplay/FlightDisplayView.qml" line="165"/>
-      <source>Flight Plan complete</source>
-      <translation type="unfinished">Flight Plan complete</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlightDisplayView.qml" line="205"/>
-      <source>%1 Images Taken</source>
-      <translation type="unfinished">%1 Images Taken</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlightDisplayView.qml" line="212"/>
-      <source>Remove plan from vehicle</source>
-      <translation type="unfinished">Remove plan from vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlightDisplayView.qml" line="222"/>
-      <source>Leave plan on vehicle</source>
-      <translation type="unfinished">Leave plan on vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlightDisplayView.qml" line="235"/>
-      <source>Resume Mission From Waypoint %1</source>
-      <translation type="unfinished">Resume Mission From Waypoint %1</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlightDisplayView.qml" line="247"/>
-      <source>Resume Mission will rebuild the current mission from the last flown waypoint and upload it to the vehicle for the next flight.</source>
-      <translation type="unfinished">Resume Mission will rebuild the current mission from the last flown waypoint and upload it to the vehicle for the next flight.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlightDisplayView.qml" line="255"/>
-      <source>If you are changing batteries for Resume Mission do not disconnect from the vehicle when communication is lost.</source>
-      <translation type="unfinished">If you are changing batteries for Resume Mission do not disconnect from the vehicle when communication is lost.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlightDisplayView.qml" line="269"/>
-      <source>If you are changing batteries for Resume Mission do not disconnect from the vehicle.</source>
-      <translation type="unfinished">If you are changing batteries for Resume Mission do not disconnect from the vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlightDisplayView.qml" line="502"/>
-      <source>Single</source>
-      <translation type="unfinished">Single</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlightDisplayView.qml" line="508"/>
-      <source>Multi-Vehicle</source>
-      <translation type="unfinished">Multi-Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlightDisplayView.qml" line="650"/>
-      <source>Action</source>
-      <translation type="unfinished">Action</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlightDisplayView.qml" line="762"/>
-      <source>Approval Pending</source>
-      <translation type="unfinished">Approval Pending</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlightDisplayView.qml" line="764"/>
-      <source>Flight Approved</source>
-      <translation type="unfinished">Flight Approved</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlightDisplayView.qml" line="766"/>
-      <source>Flight Rejected</source>
-      <translation type="unfinished">Flight Rejected</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlightDisplayViewMap</name>
-    <message>
-      <location filename="../src/FlightDisplay/FlightDisplayViewMap.qml" line="279"/>
-      <source>R</source>
-      <comment>rally point map item label</comment>
-      <translation type="unfinished">R</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlightDisplayViewMap.qml" line="304"/>
-      <source>Goto here</source>
-      <comment>Goto here waypoint</comment>
-      <translation type="unfinished">Goto here</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlightDisplayViewMap.qml" line="415"/>
-      <source>Orbit</source>
-      <comment>Orbit waypoint</comment>
-      <translation type="unfinished">Orbit</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlightDisplayViewMap.qml" line="429"/>
-      <source>Go to location</source>
-      <translation type="unfinished">Go to location</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlightDisplayViewMap.qml" line="440"/>
-      <source>Orbit at location</source>
-      <translation type="unfinished">Orbit at location</translation>
-    </message>
-  </context>
   <context>
     <name>FlightDisplayViewVideo</name>
     <message>
-      <location filename="../src/FlightDisplay/FlightDisplayViewVideo.qml" line="45"/>
+      <location filename="../src/FlightDisplay/FlightDisplayViewVideo.qml" line="47"/>
       <source>WAITING FOR VIDEO</source>
       <translation type="unfinished">WAITING FOR VIDEO</translation>
     </message>
     <message>
-      <location filename="../src/FlightDisplay/FlightDisplayViewVideo.qml" line="45"/>
+      <location filename="../src/FlightDisplay/FlightDisplayViewVideo.qml" line="47"/>
       <source>VIDEO DISABLED</source>
       <translation type="unfinished">VIDEO DISABLED</translation>
     </message>
   </context>
-  <context>
-    <name>FlightDisplayViewWidgets</name>
-    <message>
-      <location filename="../src/FlightDisplay/FlightDisplayViewWidgets.qml" line="135"/>
-      <source>No GPS Lock for Vehicle</source>
-      <translation type="unfinished">No GPS Lock for Vehicle</translation>
-    </message>
-  </context>
   <context>
     <name>FlightMap</name>
     <message>
@@ -6264,87 +6716,193 @@ Blue Robotics thrusters are lubricated by water and are not designed to be run i
     </message>
   </context>
   <context>
-    <name>GPSIndicator</name>
+    <name>FlyViewAirspaceIndicator</name>
     <message>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="46"/>
-      <source>GPS Status</source>
-      <translation type="unfinished">GPS Status</translation>
+      <location filename="../src/FlightDisplay/FlyViewAirspaceIndicator.qml" line="46"/>
+      <source>Approval Pending</source>
+      <translation type="unfinished">Approval Pending</translation>
     </message>
     <message>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="46"/>
-      <source>GPS Data Unavailable</source>
-      <translation type="unfinished">GPS Data Unavailable</translation>
+      <location filename="../src/FlightDisplay/FlyViewAirspaceIndicator.qml" line="48"/>
+      <source>Flight Approved</source>
+      <translation type="unfinished">Flight Approved</translation>
     </message>
     <message>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="59"/>
-      <source>GPS Count:</source>
-      <translation type="unfinished">GPS Count:</translation>
+      <location filename="../src/FlightDisplay/FlyViewAirspaceIndicator.qml" line="50"/>
+      <source>Flight Rejected</source>
+      <translation type="unfinished">Flight Rejected</translation>
     </message>
+  </context>
+  <context>
+    <name>FlyViewMap</name>
     <message>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="60"/>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="62"/>
-      <source>N/A</source>
-      <comment>No data to display</comment>
-      <translation type="unfinished">N/A</translation>
+      <location filename="../src/FlightDisplay/FlyViewMap.qml" line="329"/>
+      <source>R</source>
+      <comment>rally point map item label</comment>
+      <translation type="unfinished">R</translation>
     </message>
     <message>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="61"/>
-      <source>GPS Lock:</source>
-      <translation type="unfinished">GPS Lock:</translation>
+      <location filename="../src/FlightDisplay/FlyViewMap.qml" line="354"/>
+      <source>Go here</source>
+      <comment>Go to location waypoint</comment>
+      <translation type="unfinished">Go here</translation>
     </message>
     <message>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="63"/>
-      <source>HDOP:</source>
-      <translation type="unfinished">HDOP:</translation>
+      <location filename="../src/FlightDisplay/FlyViewMap.qml" line="457"/>
+      <source>ROI here</source>
+      <comment>Make this a Region Of Interest</comment>
+      <translation type="unfinished">ROI here</translation>
     </message>
     <message>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="64"/>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="66"/>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="68"/>
-      <source>--.--</source>
-      <comment>No data to display</comment>
-      <translation type="unfinished">--.--</translation>
+      <location filename="../src/FlightDisplay/FlyViewMap.qml" line="493"/>
+      <source>Orbit</source>
+      <comment>Orbit waypoint</comment>
+      <translation type="unfinished">Orbit</translation>
     </message>
     <message>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="65"/>
-      <source>VDOP:</source>
-      <translation type="unfinished">VDOP:</translation>
+      <location filename="../src/FlightDisplay/FlyViewMap.qml" line="505"/>
+      <source>Go to location</source>
+      <translation type="unfinished">Go to location</translation>
     </message>
     <message>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="67"/>
-      <source>Course Over Ground:</source>
-      <translation type="unfinished">Course Over Ground:</translation>
+      <location filename="../src/FlightDisplay/FlyViewMap.qml" line="515"/>
+      <source>Orbit at location</source>
+      <translation type="unfinished">Orbit at location</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/FlyViewMap.qml" line="525"/>
+      <source>ROI at location</source>
+      <translation type="unfinished">ROI at location</translation>
     </message>
   </context>
   <context>
-    <name>GPSRTKIndicator</name>
+    <name>FlyViewMissionCompleteDialog</name>
     <message>
-      <location filename="../src/ui/toolbar/GPSRTKIndicator.qml" line="46"/>
+      <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="45"/>
+      <source>Flight Plan complete</source>
+      <translation type="unfinished">Flight Plan complete</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="81"/>
+      <source>%1 Images Taken</source>
+      <translation type="unfinished">%1 Images Taken</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="88"/>
+      <source>Remove plan from vehicle</source>
+      <translation type="unfinished">Remove plan from vehicle</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="99"/>
+      <source>Leave plan on vehicle</source>
+      <translation type="unfinished">Leave plan on vehicle</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="117"/>
+      <source>Resume Mission From Waypoint %1</source>
+      <translation type="unfinished">Resume Mission From Waypoint %1</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="128"/>
+      <source>Resume Mission will rebuild the current mission from the last flown waypoint and upload it to the vehicle for the next flight.</source>
+      <translation type="unfinished">Resume Mission will rebuild the current mission from the last flown waypoint and upload it to the vehicle for the next flight.</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="136"/>
+      <source>If you are changing batteries for Resume Mission do not disconnect from the vehicle.</source>
+      <translation type="unfinished">If you are changing batteries for Resume Mission do not disconnect from the vehicle.</translation>
+    </message>
+  </context>
+  <context>
+    <name>FlyViewToolStrip</name>
+    <message>
+      <location filename="../src/FlightDisplay/FlyViewToolStrip.qml" line="18"/>
+      <source>Fly</source>
+      <translation type="unfinished">Fly</translation>
+    </message>
+  </context>
+  <context>
+    <name>GPSIndicator</name>
+    <message>
+      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="48"/>
+      <source>GPS Status</source>
+      <translation type="unfinished">GPS Status</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="48"/>
+      <source>GPS Data Unavailable</source>
+      <translation type="unfinished">GPS Data Unavailable</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="61"/>
+      <source>GPS Count:</source>
+      <translation type="unfinished">GPS Count:</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="62"/>
+      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="64"/>
+      <source>N/A</source>
+      <comment>No data to display</comment>
+      <translation type="unfinished">N/A</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="63"/>
+      <source>GPS Lock:</source>
+      <translation type="unfinished">GPS Lock:</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="65"/>
+      <source>HDOP:</source>
+      <translation type="unfinished">HDOP:</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="66"/>
+      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="68"/>
+      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="70"/>
+      <source>--.--</source>
+      <comment>No data to display</comment>
+      <translation type="unfinished">--.--</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="67"/>
+      <source>VDOP:</source>
+      <translation type="unfinished">VDOP:</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="69"/>
+      <source>Course Over Ground:</source>
+      <translation type="unfinished">Course Over Ground:</translation>
+    </message>
+  </context>
+  <context>
+    <name>GPSRTKIndicator</name>
+    <message>
+      <location filename="../src/ui/toolbar/GPSRTKIndicator.qml" line="47"/>
       <source>Survey-in Active</source>
       <translation type="unfinished">Survey-in Active</translation>
     </message>
     <message>
-      <location filename="../src/ui/toolbar/GPSRTKIndicator.qml" line="46"/>
+      <location filename="../src/ui/toolbar/GPSRTKIndicator.qml" line="47"/>
       <source>RTK Streaming</source>
       <translation type="unfinished">RTK Streaming</translation>
     </message>
     <message>
-      <location filename="../src/ui/toolbar/GPSRTKIndicator.qml" line="60"/>
+      <location filename="../src/ui/toolbar/GPSRTKIndicator.qml" line="61"/>
       <source>Duration:</source>
       <translation type="unfinished">Duration:</translation>
     </message>
     <message>
-      <location filename="../src/ui/toolbar/GPSRTKIndicator.qml" line="69"/>
+      <location filename="../src/ui/toolbar/GPSRTKIndicator.qml" line="70"/>
       <source>Accuracy:</source>
       <translation type="unfinished">Accuracy:</translation>
     </message>
     <message>
-      <location filename="../src/ui/toolbar/GPSRTKIndicator.qml" line="69"/>
+      <location filename="../src/ui/toolbar/GPSRTKIndicator.qml" line="70"/>
       <source>Current Accuracy:</source>
       <translation type="unfinished">Current Accuracy:</translation>
     </message>
     <message>
-      <location filename="../src/ui/toolbar/GPSRTKIndicator.qml" line="76"/>
+      <location filename="../src/ui/toolbar/GPSRTKIndicator.qml" line="77"/>
       <source>Satellites:</source>
       <translation type="unfinished">Satellites:</translation>
     </message>
@@ -6352,336 +6910,411 @@ Blue Robotics thrusters are lubricated by water and are not designed to be run i
   <context>
     <name>GeneralSettings</name>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="76"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="78"/>
       <source>Units</source>
       <translation type="unfinished">Units</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="96"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="98"/>
       <source>Distance</source>
       <translation type="unfinished">Distance</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="96"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="98"/>
       <source>Area</source>
       <translation type="unfinished">Area</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="96"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="98"/>
       <source>Speed</source>
       <translation type="unfinished">Speed</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="96"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="98"/>
       <source>Temperature</source>
       <translation type="unfinished">Temperature</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="114"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="116"/>
       <source>Miscellaneous</source>
       <translation type="unfinished">Miscellaneous</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="138"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="140"/>
       <source>Language</source>
       <translation type="unfinished">Language</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="149"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="151"/>
       <source>Color Scheme</source>
       <translation type="unfinished">Color Scheme</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="160"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="162"/>
       <source>Map Provider</source>
       <translation type="unfinished">Map Provider</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="172"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="182"/>
       <source>Map Type</source>
       <translation type="unfinished">Map Type</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="190"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="201"/>
       <source>Stream GCS Position</source>
       <translation type="unfinished">Stream GCS Position</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="221"/>
-      <source>Font Size:</source>
-      <translation type="unfinished">Font Size:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="252"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="283"/>
       <source>Mute all audio output</source>
       <translation type="unfinished">Mute all audio output</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="259"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="297"/>
       <source>AutoLoad Missions</source>
       <translation type="unfinished">AutoLoad Missions</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="268"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="306"/>
       <source>Clear all settings on next start</source>
       <translation type="unfinished">Clear all settings on next start</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="278"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="316"/>
       <source>Clear Settings</source>
       <translation type="unfinished">Clear Settings</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="279"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="317"/>
       <source>All saved settings will be reset the next time you start %1. Is this really what you want?</source>
       <translation type="unfinished">All saved settings will be reset the next time you start %1. Is this really what you want?</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="296"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="334"/>
       <source>Announce battery lower than</source>
       <translation type="unfinished">Announce battery lower than</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="325"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="363"/>
       <source>Application Load/Save Path</source>
       <translation type="unfinished">Application Load/Save Path</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="329"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="367"/>
       <source>&lt;not set&gt;</source>
       <translation type="unfinished">&lt;not set&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="332"/>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="932"/>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="954"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="370"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1135"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1157"/>
       <source>Browse</source>
       <translation type="unfinished">Browse</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="336"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="374"/>
       <source>Choose the location to save/load files</source>
       <translation type="unfinished">Choose the location to save/load files</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="349"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="387"/>
       <source>Data Persistence</source>
       <translation type="unfinished">Data Persistence</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="364"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="402"/>
       <source>Disable all data persistence</source>
       <translation type="unfinished">Disable all data persistence</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="370"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="408"/>
       <source>When Data Persistence is disabled, all telemetry logging and map tile caching is disabled and not written to disk.</source>
       <translation type="unfinished">When Data Persistence is disabled, all telemetry logging and map tile caching is disabled and not written to disk.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="380"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="418"/>
       <source>Telemetry Logs from Vehicle</source>
       <translation type="unfinished">Telemetry Logs from Vehicle</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="395"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="436"/>
       <source>Save log after each flight</source>
       <translation type="unfinished">Save log after each flight</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="403"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="444"/>
       <source>Save logs even if vehicle was not armed</source>
       <translation type="unfinished">Save logs even if vehicle was not armed</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="415"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="464"/>
       <source>Fly View</source>
       <translation type="unfinished">Fly View</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="433"/>
-      <source>Use preflight checklist</source>
-      <translation type="unfinished">Use preflight checklist</translation>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="211"/>
+      <source>UI Scaling</source>
+      <translation type="unfinished">UI Scaling</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="276"/>
+      <source>Use Vehicle Pairing</source>
+      <translation type="unfinished">Use Vehicle Pairing</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="290"/>
+      <source>Check for Internet connection</source>
+      <translation type="unfinished">Check for Internet connection</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="452"/>
+      <source>Save CSV log of telemetry data</source>
+      <translation type="unfinished">Save CSV log of telemetry data</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="441"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="483"/>
+      <source>Use Preflight Checklist</source>
+      <translation type="unfinished">Use Preflight Checklist</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="491"/>
+      <source>Enforce Preflight Checklist</source>
+      <translation type="unfinished">Enforce Preflight Checklist</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="500"/>
+      <source>Keep Map Centered On Vehicle</source>
+      <translation type="unfinished">Keep Map Centered On Vehicle</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="508"/>
+      <source>Show Telemetry Log Replay Status Bar</source>
+      <translation type="unfinished">Show Telemetry Log Replay Status Bar</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="516"/>
       <source>Virtual Joystick</source>
       <translation type="unfinished">Virtual Joystick</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="449"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="524"/>
       <source>Auto-Center throttle</source>
       <translation type="unfinished">Auto-Center throttle</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="460"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="532"/>
+      <source>Use Vertical Instrument Panel</source>
+      <translation type="unfinished">Use Vertical Instrument Panel</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="539"/>
+      <source>Show additional heading indicators on Compass</source>
+      <translation type="unfinished">Show additional heading indicators on Compass</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="546"/>
+      <source>Lock Compass Nose-Up</source>
+      <translation type="unfinished">Lock Compass Nose-Up</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="562"/>
       <source>Guided Minimum Altitude</source>
       <translation type="unfinished">Guided Minimum Altitude</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="466"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="572"/>
       <source>Guided Maximum Altitude</source>
       <translation type="unfinished">Guided Maximum Altitude</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="479"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="582"/>
+      <source>Go To Location Max Distance</source>
+      <translation type="unfinished">Go To Location Max Distance</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="598"/>
       <source>Plan View</source>
       <translation type="unfinished">Plan View</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="500"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="619"/>
       <source>Default Mission Altitude</source>
       <translation type="unfinished">Default Mission Altitude</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="513"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="627"/>
+      <source>Use MAV_CMD_CONDITION_GATE for pattern generation</source>
+      <translation type="unfinished">Use MAV_CMD_CONDITION_GATE for pattern generation</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="632"/>
+      <source>Missions Do Not Require Takeoff Item</source>
+      <translation type="unfinished">Missions Do Not Require Takeoff Item</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="643"/>
       <source>AutoConnect to the following devices</source>
       <translation type="unfinished">AutoConnect to the following devices</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="543"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="673"/>
       <source>Pixhawk</source>
       <translation type="unfinished">Pixhawk</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="543"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="673"/>
       <source>SiK Radio</source>
       <translation type="unfinished">SiK Radio</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="543"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="673"/>
       <source>PX4 Flow</source>
       <translation type="unfinished">PX4 Flow</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="543"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="673"/>
       <source>LibrePilot</source>
       <translation type="unfinished">LibrePilot</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="543"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="673"/>
       <source>UDP</source>
       <translation type="unfinished">UDP</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="543"/>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="629"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="673"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="759"/>
       <source>RTK GPS</source>
       <translation type="unfinished">RTK GPS</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="562"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="692"/>
       <source>NMEA GPS Device</source>
       <translation type="unfinished">NMEA GPS Device</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="593"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="723"/>
       <source>NMEA GPS Baudrate</source>
       <translation type="unfinished">NMEA GPS Baudrate</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="613"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="743"/>
       <source>NMEA stream UDP port</source>
       <translation type="unfinished">NMEA stream UDP port</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="652"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="782"/>
       <source>Perform Survey-In</source>
       <translation type="unfinished">Perform Survey-In</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="686"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="816"/>
       <source>Use Specified Base Position</source>
       <translation type="unfinished">Use Specified Base Position</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="747"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="877"/>
       <source>Save Current Base Position</source>
       <translation type="unfinished">Save Current Base Position</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="765"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="894"/>
+      <source>ADSB Server</source>
+      <translation type="unfinished">ADSB Server</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="912"/>
+      <source>Note: These setting are not meant for use with an ADSB transponder which is situated on the vehicle.</source>
+      <translation type="unfinished">Note: These setting are not meant for use with an ADSB transponder which is situated on the vehicle.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="958"/>
       <source>Video</source>
       <translation type="unfinished">Video</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="784"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="977"/>
       <source>Video Source</source>
       <translation type="unfinished">Video Source</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="796"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="989"/>
       <source>UDP Port</source>
       <translation type="unfinished">UDP Port</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="806"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="999"/>
       <source>RTSP URL</source>
       <translation type="unfinished">RTSP URL</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="816"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1009"/>
       <source>TCP URL</source>
       <translation type="unfinished">TCP URL</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="825"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1018"/>
       <source>Aspect Ratio</source>
       <translation type="unfinished">Aspect Ratio</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="835"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1028"/>
       <source>Disable When Disarmed</source>
       <translation type="unfinished">Disable When Disarmed</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="850"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1038"/>
+      <source>Low Latency Mode</source>
+      <translation type="unfinished">Low Latency Mode</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1053"/>
       <source>Video Recording</source>
       <translation type="unfinished">Video Recording</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="869"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1072"/>
       <source>Auto-Delete Files</source>
       <translation type="unfinished">Auto-Delete Files</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="879"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1082"/>
       <source>Max Storage Usage</source>
       <translation type="unfinished">Max Storage Usage</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="889"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1092"/>
       <source>Video File Format</source>
       <translation type="unfinished">Video File Format</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="904"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1107"/>
       <source>Brand Image</source>
       <translation type="unfinished">Brand Image</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="923"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1126"/>
       <source>Indoor Image</source>
       <translation type="unfinished">Indoor Image</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="936"/>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="958"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1139"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1161"/>
       <source>Choose custom brand image file</source>
       <translation type="unfinished">Choose custom brand image file</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="945"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1148"/>
       <source>Outdoor Image</source>
       <translation type="unfinished">Outdoor Image</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="966"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1169"/>
       <source>Reset Default Brand Image</source>
       <translation type="unfinished">Reset Default Brand Image</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="980"/>
+      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1183"/>
       <source>%1 Version</source>
       <translation type="unfinished">%1 Version</translation>
     </message>
@@ -6713,8 +7346,8 @@ Blue Robotics thrusters are lubricated by water and are not designed to be run i
     </message>
     <message>
       <location filename="../src/PlanView/GeoFenceEditor.qml" line="65"/>
-      <source>GeoFencing allows you to set a virtual ‘fence’ around the area you want to fly in.</source>
-      <translation type="unfinished">GeoFencing allows you to set a virtual ‘fence’ around the area you want to fly in.</translation>
+      <source>GeoFencing allows you to set a virtual fence around the area you want to fly in.</source>
+      <translation type="unfinished">GeoFencing allows you to set a virtual fence around the area you want to fly in.</translation>
     </message>
     <message>
       <location filename="../src/PlanView/GeoFenceEditor.qml" line="66"/>
@@ -6722,82 +7355,82 @@ Blue Robotics thrusters are lubricated by water and are not designed to be run i
       <translation type="unfinished">This vehicle does not support GeoFence.</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="114"/>
+      <location filename="../src/PlanView/GeoFenceEditor.qml" line="116"/>
       <source>Insert GeoFence</source>
       <translation type="unfinished">Insert GeoFence</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="119"/>
+      <location filename="../src/PlanView/GeoFenceEditor.qml" line="121"/>
       <source>Polygon Fence</source>
       <translation type="unfinished">Polygon Fence</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="131"/>
+      <location filename="../src/PlanView/GeoFenceEditor.qml" line="133"/>
       <source>Circular Fence</source>
       <translation type="unfinished">Circular Fence</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="143"/>
+      <location filename="../src/PlanView/GeoFenceEditor.qml" line="147"/>
       <source>Polygon Fences</source>
       <translation type="unfinished">Polygon Fences</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="147"/>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="220"/>
+      <location filename="../src/PlanView/GeoFenceEditor.qml" line="151"/>
+      <location filename="../src/PlanView/GeoFenceEditor.qml" line="226"/>
       <source>None</source>
       <translation type="unfinished">None</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="158"/>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="232"/>
+      <location filename="../src/PlanView/GeoFenceEditor.qml" line="162"/>
+      <location filename="../src/PlanView/GeoFenceEditor.qml" line="238"/>
       <source>Inclusion</source>
       <translation type="unfinished">Inclusion</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="174"/>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="248"/>
+      <location filename="../src/PlanView/GeoFenceEditor.qml" line="178"/>
+      <location filename="../src/PlanView/GeoFenceEditor.qml" line="254"/>
       <source>Edit</source>
       <translation type="unfinished">Edit</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="198"/>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="288"/>
+      <location filename="../src/PlanView/GeoFenceEditor.qml" line="202"/>
+      <location filename="../src/PlanView/GeoFenceEditor.qml" line="294"/>
       <source>Delete</source>
       <translation type="unfinished">Delete</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="207"/>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="297"/>
+      <location filename="../src/PlanView/GeoFenceEditor.qml" line="211"/>
+      <location filename="../src/PlanView/GeoFenceEditor.qml" line="303"/>
       <source>Del</source>
       <translation type="unfinished">Del</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="216"/>
+      <location filename="../src/PlanView/GeoFenceEditor.qml" line="222"/>
       <source>Circular Fences</source>
       <translation type="unfinished">Circular Fences</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="272"/>
+      <location filename="../src/PlanView/GeoFenceEditor.qml" line="278"/>
       <source>Radius</source>
       <translation type="unfinished">Radius</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="306"/>
+      <location filename="../src/PlanView/GeoFenceEditor.qml" line="314"/>
       <source>Breach Return Point</source>
       <translation type="unfinished">Breach Return Point</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="310"/>
+      <location filename="../src/PlanView/GeoFenceEditor.qml" line="318"/>
       <source>Add Breach Return Point</source>
       <translation type="unfinished">Add Breach Return Point</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="319"/>
+      <location filename="../src/PlanView/GeoFenceEditor.qml" line="327"/>
       <source>Remove Breach Return Point</source>
       <translation type="unfinished">Remove Breach Return Point</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="334"/>
+      <location filename="../src/PlanView/GeoFenceEditor.qml" line="342"/>
       <source>Altitude</source>
       <translation type="unfinished">Altitude</translation>
     </message>
@@ -6828,7 +7461,7 @@ Blue Robotics thrusters are lubricated by water and are not designed to be run i
   <context>
     <name>GeoFenceMapVisuals</name>
     <message>
-      <location filename="../src/PlanView/GeoFenceMapVisuals.qml" line="167"/>
+      <location filename="../src/PlanView/GeoFenceMapVisuals.qml" line="170"/>
       <source>B</source>
       <comment>Breach Return Point item indicator</comment>
       <translation type="unfinished">B</translation>
@@ -6925,58 +7558,58 @@ Blue Robotics thrusters are lubricated by water and are not designed to be run i
   <context>
     <name>GeoTagWorker</name>
     <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="161"/>
+      <location filename="../src/AnalyzeView/GeoTagController.cc" line="158"/>
       <source>The image directory doesn&apos;t contain images, make sure your images are of the JPG format</source>
       <translation type="unfinished">The image directory doesn&apos;t contain images, make sure your images are of the JPG format</translation>
     </message>
     <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="172"/>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="260"/>
+      <location filename="../src/AnalyzeView/GeoTagController.cc" line="169"/>
+      <location filename="../src/AnalyzeView/GeoTagController.cc" line="257"/>
       <source>Geotagging failed. Couldn&apos;t open an image.</source>
       <translation type="unfinished">Geotagging failed. Couldn&apos;t open an image.</translation>
     </message>
     <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="184"/>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="216"/>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="231"/>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="245"/>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="287"/>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="294"/>
+      <location filename="../src/AnalyzeView/GeoTagController.cc" line="181"/>
+      <location filename="../src/AnalyzeView/GeoTagController.cc" line="213"/>
+      <location filename="../src/AnalyzeView/GeoTagController.cc" line="228"/>
+      <location filename="../src/AnalyzeView/GeoTagController.cc" line="242"/>
+      <location filename="../src/AnalyzeView/GeoTagController.cc" line="284"/>
+      <location filename="../src/AnalyzeView/GeoTagController.cc" line="291"/>
       <source>Tagging cancelled</source>
       <translation type="unfinished">Tagging cancelled</translation>
     </message>
     <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="193"/>
+      <location filename="../src/AnalyzeView/GeoTagController.cc" line="190"/>
       <source>Geotagging failed. Couldn&apos;t open log file.</source>
       <translation type="unfinished">Geotagging failed. Couldn&apos;t open log file.</translation>
     </message>
     <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="220"/>
+      <location filename="../src/AnalyzeView/GeoTagController.cc" line="217"/>
       <source>%1 - tagging cancelled</source>
       <translation type="unfinished">%1 - tagging cancelled</translation>
     </message>
     <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="220"/>
+      <location filename="../src/AnalyzeView/GeoTagController.cc" line="217"/>
       <source>Log parsing failed</source>
       <translation type="unfinished">Log parsing failed</translation>
     </message>
     <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="238"/>
+      <location filename="../src/AnalyzeView/GeoTagController.cc" line="235"/>
       <source>Geotagging failed in trigger filtering</source>
       <translation type="unfinished">Geotagging failed in trigger filtering</translation>
     </message>
     <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="255"/>
-      <source>Geotagging failed. Image requested not present.</source>
-      <translation type="unfinished">Geotagging failed. Image requested not present.</translation>
+      <location filename="../src/AnalyzeView/GeoTagController.cc" line="252"/>
+      <source>Geotagging failed. Requesting image #%1, but only %2 images present.</source>
+      <translation type="unfinished">Geotagging failed. Requesting image #%1, but only %2 images present.</translation>
     </message>
     <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="267"/>
+      <location filename="../src/AnalyzeView/GeoTagController.cc" line="264"/>
       <source>Geotagging failed. Couldn&apos;t write to image.</source>
       <translation type="unfinished">Geotagging failed. Couldn&apos;t write to image.</translation>
     </message>
     <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="277"/>
+      <location filename="../src/AnalyzeView/GeoTagController.cc" line="274"/>
       <source>Geotagging failed. Couldn&apos;t write to an image.</source>
       <translation type="unfinished">Geotagging failed. Couldn&apos;t write to an image.</translation>
     </message>
@@ -6984,7 +7617,7 @@ Blue Robotics thrusters are lubricated by water and are not designed to be run i
   <context>
     <name>GuidedActionConfirm</name>
     <message>
-      <location filename="../src/FlightDisplay/GuidedActionConfirm.qml" line="116"/>
+      <location filename="../src/FlightDisplay/GuidedActionConfirm.qml" line="115"/>
       <source>Slide to confirm</source>
       <translation type="unfinished">Slide to confirm</translation>
     </message>
@@ -6992,7 +7625,7 @@ Blue Robotics thrusters are lubricated by water and are not designed to be run i
   <context>
     <name>GuidedActionList</name>
     <message>
-      <location filename="../src/FlightDisplay/GuidedActionList.qml" line="49"/>
+      <location filename="../src/FlightDisplay/GuidedActionList.qml" line="81"/>
       <source>Select Action</source>
       <translation type="unfinished">Select Action</translation>
     </message>
@@ -7016,8 +7649,8 @@ Blue Robotics thrusters are lubricated by water and are not designed to be run i
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="39"/>
-      <source>RTL</source>
-      <translation type="unfinished">RTL</translation>
+      <source>Return</source>
+      <translation type="unfinished">Return</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="40"/>
@@ -7081,116 +7714,131 @@ Blue Robotics thrusters are lubricated by water and are not designed to be run i
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="52"/>
-      <source>Goto Location</source>
-      <translation type="unfinished">Goto Location</translation>
+      <source>Go To Location</source>
+      <translation type="unfinished">Go To Location</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="65"/>
+      <source>Return to the launch position of the vehicle.</source>
+      <translation type="unfinished">Return to the launch position of the vehicle.</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="53"/>
       <source>VTOL Transition</source>
       <translation type="unfinished">VTOL Transition</translation>
     </message>
+    <message>
+      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="54"/>
+      <source>ROI</source>
+      <translation type="unfinished">ROI</translation>
+    </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="55"/>
+      <source>Action</source>
+      <translation type="unfinished">Action</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="57"/>
       <source>Arm the vehicle.</source>
       <translation type="unfinished">Arm the vehicle.</translation>
     </message>
     <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="56"/>
+      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="58"/>
       <source>Disarm the vehicle</source>
       <translation type="unfinished">Disarm the vehicle</translation>
     </message>
     <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="57"/>
+      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="59"/>
       <source>WARNING: THIS WILL STOP ALL MOTORS. IF VEHICLE IS CURRENTLY IN THE AIR IT WILL CRASH.</source>
       <translation type="unfinished">WARNING: THIS WILL STOP ALL MOTORS. IF VEHICLE IS CURRENTLY IN THE AIR IT WILL CRASH.</translation>
     </message>
     <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="58"/>
+      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="60"/>
       <source>Takeoff from ground and hold position.</source>
       <translation type="unfinished">Takeoff from ground and hold position.</translation>
     </message>
     <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="59"/>
+      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="61"/>
       <source>Takeoff from ground and start the current mission.</source>
       <translation type="unfinished">Takeoff from ground and start the current mission.</translation>
     </message>
     <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="60"/>
+      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="62"/>
       <source>Continue the mission from the current waypoint.</source>
       <translation type="unfinished">Continue the mission from the current waypoint.</translation>
     </message>
     <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="61"/>
+      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="63"/>
       <source>Upload of resume mission failed. Confirm to retry upload</source>
       <translation type="unfinished">Upload of resume mission failed. Confirm to retry upload</translation>
     </message>
     <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="62"/>
+      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="64"/>
       <source>Land the vehicle at the current position.</source>
       <translation type="unfinished">Land the vehicle at the current position.</translation>
     </message>
     <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="63"/>
-      <source>Return to the home position of the vehicle.</source>
-      <translation type="unfinished">Return to the home position of the vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="64"/>
+      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="66"/>
       <source>Change the altitude of the vehicle up or down.</source>
       <translation type="unfinished">Change the altitude of the vehicle up or down.</translation>
     </message>
     <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="65"/>
+      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="67"/>
       <source>Move the vehicle to the specified location.</source>
       <translation type="unfinished">Move the vehicle to the specified location.</translation>
     </message>
     <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="66"/>
+      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="68"/>
       <source>Adjust current waypoint to %1.</source>
       <translation type="unfinished">Adjust current waypoint to %1.</translation>
     </message>
     <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="67"/>
+      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="69"/>
       <source>Orbit the vehicle around the specified location.</source>
       <translation type="unfinished">Orbit the vehicle around the specified location.</translation>
     </message>
     <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="68"/>
+      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="70"/>
       <source>Abort the landing sequence.</source>
       <translation type="unfinished">Abort the landing sequence.</translation>
     </message>
     <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="69"/>
+      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="71"/>
       <source>Pause the vehicle at it&apos;s current position, adjusting altitude up or down as needed.</source>
       <translation type="unfinished">Pause the vehicle at it&apos;s current position, adjusting altitude up or down as needed.</translation>
     </message>
     <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="70"/>
+      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="72"/>
       <source>Pause all vehicles at their current position.</source>
       <translation type="unfinished">Pause all vehicles at their current position.</translation>
     </message>
     <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="71"/>
+      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="73"/>
       <source>Transition VTOL to fixed wing flight.</source>
       <translation type="unfinished">Transition VTOL to fixed wing flight.</translation>
     </message>
     <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="72"/>
+      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="74"/>
       <source>Transition VTOL to multi-rotor flight.</source>
       <translation type="unfinished">Transition VTOL to multi-rotor flight.</translation>
     </message>
     <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="142"/>
+      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="75"/>
+      <source>Make the specified location a Region Of Interest.</source>
+      <translation type="unfinished">Make the specified location a Region Of Interest.</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="155"/>
       <source>activeVehicle(%1) _vehicleArmed(%2) guidedModeSupported(%3) _vehicleFlying(%4) _vehicleWasFlying(%5) _vehicleInRTLMode(%6) pauseVehicleSupported(%7) _vehiclePaused(%8) _flightMode(%9) _missionItemCount(%10)</source>
       <translation type="unfinished">activeVehicle(%1) _vehicleArmed(%2) guidedModeSupported(%3) _vehicleFlying(%4) _vehicleWasFlying(%5) _vehicleInRTLMode(%6) pauseVehicleSupported(%7) _vehiclePaused(%8) _flightMode(%9) _missionItemCount(%10)</translation>
     </message>
     <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="289"/>
+      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="358"/>
       <source>Smart RTL</source>
       <translation type="unfinished">Smart RTL</translation>
     </message>
     <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="420"/>
+      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="500"/>
       <source>Internal error: unknown actionCode</source>
       <translation type="unfinished">Internal error: unknown actionCode</translation>
     </message>
@@ -7198,7 +7846,7 @@ Blue Robotics thrusters are lubricated by water and are not designed to be run i
   <context>
     <name>GuidedAltitudeSlider</name>
     <message>
-      <location filename="../src/FlightDisplay/GuidedAltitudeSlider.qml" line="63"/>
+      <location filename="../src/FlightDisplay/GuidedAltitudeSlider.qml" line="64"/>
       <source>New Alt(rel)</source>
       <translation type="unfinished">New Alt(rel)</translation>
     </message>
@@ -7230,536 +7878,593 @@ Blue Robotics thrusters are lubricated by water and are not designed to be run i
     </message>
   </context>
   <context>
-    <name>Joystick</name>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="41"/>
-      <source>Arm</source>
-      <translation type="unfinished">Arm</translation>
-    </message>
+    <name>HorizontalFactValueGrid</name>
     <message>
-      <location filename="../src/Joystick/Joystick.cc" line="42"/>
-      <source>Disarm</source>
-      <translation type="unfinished">Disarm</translation>
+      <location filename="../src/QmlControls/HorizontalFactValueGrid.qml" line="128"/>
+      <location filename="../src/QmlControls/HorizontalFactValueGrid.qml" line="154"/>
+      <source>+</source>
+      <translation type="unfinished">+</translation>
     </message>
     <message>
-      <location filename="../src/Joystick/Joystick.cc" line="43"/>
-      <source>VTOL: Fixed Wing</source>
-      <translation type="unfinished">VTOL: Fixed Wing</translation>
+      <location filename="../src/QmlControls/HorizontalFactValueGrid.qml" line="135"/>
+      <location filename="../src/QmlControls/HorizontalFactValueGrid.qml" line="162"/>
+      <source>-</source>
+      <translation type="unfinished">-</translation>
     </message>
+  </context>
+  <context>
+    <name>InstrumentValue</name>
     <message>
-      <location filename="../src/Joystick/Joystick.cc" line="44"/>
-      <source>VTOL: Multi-Rotor</source>
-      <translation type="unfinished">VTOL: Multi-Rotor</translation>
+      <location filename="../src/QmlControls/InstrumentValueData.cc" line="21"/>
+      <source>None</source>
+      <translation type="unfinished">None</translation>
     </message>
     <message>
-      <location filename="../src/Joystick/Joystick.cc" line="45"/>
-      <source>Zoom In</source>
-      <translation type="unfinished">Zoom In</translation>
+      <location filename="../src/QmlControls/InstrumentValueData.cc" line="22"/>
+      <source>Color</source>
+      <translation type="unfinished">Color</translation>
     </message>
     <message>
-      <location filename="../src/Joystick/Joystick.cc" line="46"/>
-      <source>Zoom Out</source>
-      <translation type="unfinished">Zoom Out</translation>
+      <location filename="../src/QmlControls/InstrumentValueData.cc" line="23"/>
+      <source>Opacity</source>
+      <translation type="unfinished">Opacity</translation>
     </message>
     <message>
-      <location filename="../src/Joystick/Joystick.cc" line="47"/>
-      <source>Next Video Stream</source>
-      <translation type="unfinished">Next Video Stream</translation>
+      <location filename="../src/QmlControls/InstrumentValueData.cc" line="24"/>
+      <source>Icon</source>
+      <translation type="unfinished">Icon</translation>
     </message>
+  </context>
+  <context>
+    <name>InstrumentValueArea</name>
     <message>
-      <location filename="../src/Joystick/Joystick.cc" line="48"/>
-      <source>Previous Video Stream</source>
-      <translation type="unfinished">Previous Video Stream</translation>
+      <location filename="../src/QmlControls/InstrumentValueArea.qml" line="85"/>
+      <location filename="../src/QmlControls/InstrumentValueArea.qml" line="109"/>
+      <source>+</source>
+      <translation type="unfinished">+</translation>
     </message>
     <message>
-      <location filename="../src/Joystick/Joystick.cc" line="49"/>
-      <source>Next Camera</source>
-      <translation type="unfinished">Next Camera</translation>
+      <location filename="../src/QmlControls/InstrumentValueArea.qml" line="93"/>
+      <location filename="../src/QmlControls/InstrumentValueArea.qml" line="116"/>
+      <source>-</source>
+      <translation type="unfinished">-</translation>
     </message>
     <message>
-      <location filename="../src/Joystick/Joystick.cc" line="50"/>
-      <source>Previous Camera</source>
-      <translation type="unfinished">Previous Camera</translation>
+      <location filename="../src/QmlControls/InstrumentValueArea.qml" line="127"/>
+      <source>Reset To Defaults</source>
+      <translation type="unfinished">Reset To Defaults</translation>
     </message>
   </context>
   <context>
-    <name>JoystickConfig</name>
+    <name>InstrumentValueEditDialog</name>
     <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="27"/>
-      <source>Joystick</source>
-      <translation type="unfinished">Joystick</translation>
+      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="25"/>
+      <source>Value Display</source>
+      <translation type="unfinished">Value Display</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="28"/>
-      <source>Joystick Setup is used to configure a calibrate joysticks.</source>
-      <translation type="unfinished">Joystick Setup is used to configure a calibrate joysticks.</translation>
+      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="74"/>
+      <source>Icon</source>
+      <translation type="unfinished">Icon</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="127"/>
-      <source>Not Mapped</source>
-      <translation type="unfinished">Not Mapped</translation>
+      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="114"/>
+      <source>Text</source>
+      <translation type="unfinished">Text</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="167"/>
-      <source>Attitude Controls</source>
-      <translation type="unfinished">Attitude Controls</translation>
+      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="118"/>
+      <source>Label</source>
+      <translation type="unfinished">Label</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="176"/>
-      <source>Lateral</source>
-      <translation type="unfinished">Lateral</translation>
+      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="131"/>
+      <source>Size</source>
+      <translation type="unfinished">Size</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="176"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
+      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="144"/>
+      <source>Show Units</source>
+      <translation type="unfinished">Show Units</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="205"/>
-      <source>Forward</source>
-      <translation type="unfinished">Forward</translation>
+      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="149"/>
+      <source>Range</source>
+      <translation type="unfinished">Range</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="205"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
+      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="230"/>
+      <source>Specify the color you want to apply based on value ranges. The color will be applied to the icon if available, otherwise to the value itself.</source>
+      <translation type="unfinished">Specify the color you want to apply based on value ranges. The color will be applied to the icon if available, otherwise to the value itself.</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="234"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
+      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="248"/>
+      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="355"/>
+      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="454"/>
+      <source>-</source>
+      <translation type="unfinished">-</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="263"/>
-      <source>Throttle</source>
-      <translation type="unfinished">Throttle</translation>
+      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="305"/>
+      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="404"/>
+      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="489"/>
+      <source>Add Row</source>
+      <translation type="unfinished">Add Row</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="293"/>
-      <source>Skip</source>
-      <translation type="unfinished">Skip</translation>
+      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="337"/>
+      <source>Specify the icon you want to display based on value ranges.</source>
+      <translation type="unfinished">Specify the icon you want to display based on value ranges.</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="300"/>
-      <source>Cancel</source>
-      <translation type="unfinished">Cancel</translation>
+      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="436"/>
+      <source>Specify the icon opacity you want based on value ranges.</source>
+      <translation type="unfinished">Specify the icon opacity you want based on value ranges.</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="308"/>
-      <source>Calibrate</source>
-      <translation type="unfinished">Calibrate</translation>
+      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="504"/>
+      <source>Select Icon</source>
+      <translation type="unfinished">Select Icon</translation>
     </message>
+  </context>
+  <context>
+    <name>Joystick</name>
     <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="338"/>
-      <source>Additional Joystick settings:</source>
-      <translation type="unfinished">Additional Joystick settings:</translation>
+      <location filename="../src/Joystick/Joystick.cc" line="44"/>
+      <source>No Action</source>
+      <translation type="unfinished">No Action</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="348"/>
-      <source>Enable joystick input</source>
-      <translation type="unfinished">Enable joystick input</translation>
+      <location filename="../src/Joystick/Joystick.cc" line="45"/>
+      <source>Arm</source>
+      <translation type="unfinished">Arm</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="348"/>
-      <source>Enable not allowed (Calibrate First)</source>
-      <translation type="unfinished">Enable not allowed (Calibrate First)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="378"/>
-      <source>Active joystick:</source>
-      <translation type="unfinished">Active joystick:</translation>
+      <location filename="../src/Joystick/Joystick.cc" line="46"/>
+      <source>Disarm</source>
+      <translation type="unfinished">Disarm</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="391"/>
-      <source>Active joystick name not in combo</source>
-      <translation type="unfinished">Active joystick name not in combo</translation>
+      <location filename="../src/Joystick/Joystick.cc" line="47"/>
+      <source>Toggle Arm</source>
+      <translation type="unfinished">Toggle Arm</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="414"/>
-      <source>Center stick is zero throttle</source>
-      <translation type="unfinished">Center stick is zero throttle</translation>
+      <location filename="../src/Joystick/Joystick.cc" line="48"/>
+      <source>VTOL: Fixed Wing</source>
+      <translation type="unfinished">VTOL: Fixed Wing</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="429"/>
-      <source>Spring loaded throttle smoothing</source>
-      <translation type="unfinished">Spring loaded throttle smoothing</translation>
+      <location filename="../src/Joystick/Joystick.cc" line="49"/>
+      <source>VTOL: Multi-Rotor</source>
+      <translation type="unfinished">VTOL: Multi-Rotor</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="436"/>
-      <source>Full down stick is zero throttle</source>
-      <translation type="unfinished">Full down stick is zero throttle</translation>
+      <location filename="../src/Joystick/Joystick.cc" line="50"/>
+      <source>Continuous Zoom In</source>
+      <translation type="unfinished">Continuous Zoom In</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="445"/>
-      <source>Allow negative Thrust</source>
-      <translation type="unfinished">Allow negative Thrust</translation>
+      <location filename="../src/Joystick/Joystick.cc" line="51"/>
+      <source>Continuous Zoom Out</source>
+      <translation type="unfinished">Continuous Zoom Out</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="457"/>
-      <source>Exponential:</source>
-      <translation type="unfinished">Exponential:</translation>
+      <location filename="../src/Joystick/Joystick.cc" line="52"/>
+      <source>Step Zoom In</source>
+      <translation type="unfinished">Step Zoom In</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="480"/>
-      <source>Advanced settings (careful!)</source>
-      <translation type="unfinished">Advanced settings (careful!)</translation>
+      <location filename="../src/Joystick/Joystick.cc" line="53"/>
+      <source>Step Zoom Out</source>
+      <translation type="unfinished">Step Zoom Out</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="497"/>
-      <source>Joystick mode:</source>
-      <translation type="unfinished">Joystick mode:</translation>
+      <location filename="../src/Joystick/Joystick.cc" line="58"/>
+      <source>Trigger Camera</source>
+      <translation type="unfinished">Trigger Camera</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="515"/>
-      <source>Message frequency (Hz):</source>
-      <translation type="unfinished">Message frequency (Hz):</translation>
+      <location filename="../src/Joystick/Joystick.cc" line="59"/>
+      <source>Start Recording Video</source>
+      <translation type="unfinished">Start Recording Video</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="535"/>
-      <source>Enable circle correction</source>
-      <translation type="unfinished">Enable circle correction</translation>
+      <location filename="../src/Joystick/Joystick.cc" line="60"/>
+      <source>Stop Recording Video</source>
+      <translation type="unfinished">Stop Recording Video</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="552"/>
-      <source>Deadbands</source>
-      <translation type="unfinished">Deadbands</translation>
+      <location filename="../src/Joystick/Joystick.cc" line="61"/>
+      <source>Toggle Recording Video</source>
+      <translation type="unfinished">Toggle Recording Video</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="565"/>
-      <source>Deadband can be set during the first </source>
-      <translation type="unfinished">Deadband can be set during the first </translation>
+      <location filename="../src/Joystick/Joystick.cc" line="62"/>
+      <source>Gimbal Down</source>
+      <translation type="unfinished">Gimbal Down</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="566"/>
-      <source>step of calibration by gently wiggling each axis. </source>
-      <translation type="unfinished">step of calibration by gently wiggling each axis. </translation>
+      <location filename="../src/Joystick/Joystick.cc" line="63"/>
+      <source>Gimbal Up</source>
+      <translation type="unfinished">Gimbal Up</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="567"/>
-      <source>Deadband can also be adjusted by clicking and </source>
-      <translation type="unfinished">Deadband can also be adjusted by clicking and </translation>
+      <location filename="../src/Joystick/Joystick.cc" line="64"/>
+      <source>Gimbal Left</source>
+      <translation type="unfinished">Gimbal Left</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="568"/>
-      <source>dragging vertically on the corresponding axis monitor.</source>
-      <translation type="unfinished">dragging vertically on the corresponding axis monitor.</translation>
+      <location filename="../src/Joystick/Joystick.cc" line="65"/>
+      <source>Gimbal Right</source>
+      <translation type="unfinished">Gimbal Right</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="593"/>
-      <source>Button actions:</source>
-      <translation type="unfinished">Button actions:</translation>
+      <location filename="../src/Joystick/Joystick.cc" line="66"/>
+      <source>Gimbal Center</source>
+      <translation type="unfinished">Gimbal Center</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="652"/>
-      <source>#</source>
-      <translation type="unfinished">#</translation>
+      <location filename="../src/Joystick/Joystick.cc" line="67"/>
+      <source>Emergency Stop</source>
+      <translation type="unfinished">Emergency Stop</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="657"/>
-      <source>Function: </source>
-      <translation type="unfinished">Function: </translation>
+      <location filename="../src/Joystick/Joystick.cc" line="54"/>
+      <source>Next Video Stream</source>
+      <translation type="unfinished">Next Video Stream</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="662"/>
-      <source>Shift Function: </source>
-      <translation type="unfinished">Shift Function: </translation>
+      <location filename="../src/Joystick/Joystick.cc" line="55"/>
+      <source>Previous Video Stream</source>
+      <translation type="unfinished">Previous Video Stream</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="774"/>
-      <source>Axis Monitor</source>
-      <translation type="unfinished">Axis Monitor</translation>
+      <location filename="../src/Joystick/Joystick.cc" line="56"/>
+      <source>Next Camera</source>
+      <translation type="unfinished">Next Camera</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="856"/>
-      <source>Button Monitor</source>
-      <translation type="unfinished">Button Monitor</translation>
+      <location filename="../src/Joystick/Joystick.cc" line="57"/>
+      <source>Previous Camera</source>
+      <translation type="unfinished">Previous Camera</translation>
     </message>
   </context>
   <context>
-    <name>JoystickConfigController</name>
+    <name>JoystickConfig</name>
     <message>
-      <location filename="../src/VehicleSetup/JoystickConfigController.cc" line="180"/>
-      <source>Detected %1 joystick axes. To operate PX4, you need at least %2 axes.</source>
-      <translation type="unfinished">Detected %1 joystick axes. To operate PX4, you need at least %2 axes.</translation>
+      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="28"/>
+      <source>Joystick</source>
+      <translation type="unfinished">Joystick</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/JoystickConfigController.cc" line="606"/>
-      <source>Calibrate</source>
-      <translation type="unfinished">Calibrate</translation>
+      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="69"/>
+      <source>General</source>
+      <translation type="unfinished">General</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/JoystickConfigController.cc" line="630"/>
-      <source>The current calibration settings are now displayed for each axis on screen.
-
-Click the Next button to upload calibration to board. Click Cancel if you don&apos;t want to save these values.</source>
-      <translation type="unfinished">The current calibration settings are now displayed for each axis on screen.
-
-Click the Next button to upload calibration to board. Click Cancel if you don&apos;t want to save these values.</translation>
+      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="72"/>
+      <source>Button Assigment</source>
+      <translation type="unfinished">Button Assigment</translation>
+    </message>
+    <message>
+      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="75"/>
+      <source>Calibration</source>
+      <translation type="unfinished">Calibration</translation>
+    </message>
+    <message>
+      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="78"/>
+      <source>Advanced</source>
+      <translation type="unfinished">Advanced</translation>
     </message>
   </context>
   <context>
-    <name>JoystickIndicator</name>
+    <name>JoystickConfigAdvanced</name>
     <message>
-      <location filename="../src/ui/toolbar/JoystickIndicator.qml" line="47"/>
-      <source>Joystick Status</source>
-      <translation type="unfinished">Joystick Status</translation>
+      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="36"/>
+      <source>Full down stick is zero throttle</source>
+      <translation type="unfinished">Full down stick is zero throttle</translation>
     </message>
     <message>
-      <location filename="../src/ui/toolbar/JoystickIndicator.qml" line="59"/>
-      <source>Connected:</source>
-      <translation type="unfinished">Connected:</translation>
+      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="42"/>
+      <source>Center stick is zero throttle</source>
+      <translation type="unfinished">Center stick is zero throttle</translation>
     </message>
     <message>
-      <location filename="../src/ui/toolbar/JoystickIndicator.qml" line="64"/>
-      <source>Enabled:</source>
-      <translation type="unfinished">Enabled:</translation>
+      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="49"/>
+      <source>Spring loaded throttle smoothing</source>
+      <translation type="unfinished">Spring loaded throttle smoothing</translation>
     </message>
-  </context>
-  <context>
-    <name>KMLFileHelper</name>
     <message>
-      <location filename="../src/KMLFileHelper.cc" line="15"/>
-      <source>KML file load failed. %1</source>
-      <translation type="unfinished">KML file load failed. %1</translation>
+      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="61"/>
+      <source>Allow negative Thrust</source>
+      <translation type="unfinished">Allow negative Thrust</translation>
     </message>
     <message>
-      <location filename="../src/KMLFileHelper.cc" line="24"/>
-      <source>File not found: %1</source>
-      <translation type="unfinished">File not found: %1</translation>
+      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="73"/>
+      <source>Exponential:</source>
+      <translation type="unfinished">Exponential:</translation>
     </message>
     <message>
-      <location filename="../src/KMLFileHelper.cc" line="29"/>
-      <source>Unable to open file: %1 error: $%2</source>
-      <translation type="unfinished">Unable to open file: %1 error: $%2</translation>
+      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="93"/>
+      <source>Enable further advanced settings (careful!)</source>
+      <translation type="unfinished">Enable further advanced settings (careful!)</translation>
     </message>
     <message>
-      <location filename="../src/KMLFileHelper.cc" line="37"/>
-      <source>Unable to parse KML file: %1 error: %2 line: %3</source>
-      <translation type="unfinished">Unable to parse KML file: %1 error: %2 line: %3</translation>
+      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="109"/>
+      <source>Enable gimbal control (Experimental)</source>
+      <translation type="unfinished">Enable gimbal control (Experimental)</translation>
     </message>
     <message>
-      <location filename="../src/KMLFileHelper.cc" line="61"/>
-      <source>No supported type found in KML file.</source>
-      <translation type="unfinished">No supported type found in KML file.</translation>
+      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="134"/>
+      <source>Joystick mode:</source>
+      <translation type="unfinished">Joystick mode:</translation>
     </message>
     <message>
-      <location filename="../src/KMLFileHelper.cc" line="77"/>
-      <source>Unable to find Polygon node in KML</source>
-      <translation type="unfinished">Unable to find Polygon node in KML</translation>
+      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="149"/>
+      <source>Axis frequency (Hz):</source>
+      <translation type="unfinished">Axis frequency (Hz):</translation>
     </message>
     <message>
-      <location filename="../src/KMLFileHelper.cc" line="83"/>
-      <location filename="../src/KMLFileHelper.cc" line="144"/>
-      <source>Internal error: Unable to find coordinates node in KML</source>
-      <translation type="unfinished">Internal error: Unable to find coordinates node in KML</translation>
+      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="167"/>
+      <source>Button repeat frequency (Hz):</source>
+      <translation type="unfinished">Button repeat frequency (Hz):</translation>
     </message>
     <message>
-      <location filename="../src/KMLFileHelper.cc" line="138"/>
-      <source>Unable to find LineString node in KML</source>
-      <translation type="unfinished">Unable to find LineString node in KML</translation>
+      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="185"/>
+      <source>Enable circle correction</source>
+      <translation type="unfinished">Enable circle correction</translation>
+    </message>
+    <message>
+      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="203"/>
+      <source>Deadbands</source>
+      <translation type="unfinished">Deadbands</translation>
+    </message>
+    <message>
+      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="220"/>
+      <source>Deadband can be set during the first </source>
+      <translation type="unfinished">Deadband can be set during the first </translation>
+    </message>
+    <message>
+      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="221"/>
+      <source>step of calibration by gently wiggling each axis. </source>
+      <translation type="unfinished">step of calibration by gently wiggling each axis. </translation>
+    </message>
+    <message>
+      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="222"/>
+      <source>Deadband can also be adjusted by clicking and </source>
+      <translation type="unfinished">Deadband can also be adjusted by clicking and </translation>
+    </message>
+    <message>
+      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="223"/>
+      <source>dragging vertically on the corresponding axis monitor.</source>
+      <translation type="unfinished">dragging vertically on the corresponding axis monitor.</translation>
     </message>
   </context>
   <context>
-    <name>LinechartWidget</name>
+    <name>JoystickConfigButtons</name>
     <message>
-      <location filename="../src/ui/linechart/LinechartWidget.cc" line="106"/>
-      <source>Name</source>
-      <translation type="unfinished">Name</translation>
+      <location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="45"/>
+      <source>Assigning the same action to multiple buttons requires the press of all those buttons for the action to be taken. This is useful to prevent accidental button presses for critical actions like Arm or Emergency Stop.</source>
+      <translation type="unfinished">Assigning the same action to multiple buttons requires the press of all those buttons for the action to be taken. This is useful to prevent accidental button presses for critical actions like Arm or Emergency Stop.</translation>
     </message>
     <message>
-      <location filename="../src/ui/linechart/LinechartWidget.cc" line="107"/>
-      <source>Val</source>
-      <translation type="unfinished">Val</translation>
+      <location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="93"/>
+      <source>Repeat</source>
+      <translation type="unfinished">Repeat</translation>
     </message>
     <message>
-      <location filename="../src/ui/linechart/LinechartWidget.cc" line="109"/>
-      <source>Unit</source>
-      <translation type="unfinished">Unit</translation>
+      <location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="123"/>
+      <source>#</source>
+      <translation type="unfinished">#</translation>
     </message>
     <message>
-      <location filename="../src/ui/linechart/LinechartWidget.cc" line="112"/>
-      <source>Mean</source>
-      <translation type="unfinished">Mean</translation>
+      <location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="127"/>
+      <source>Function: </source>
+      <translation type="unfinished">Function: </translation>
     </message>
     <message>
-      <location filename="../src/ui/linechart/LinechartWidget.cc" line="113"/>
-      <source>Variance</source>
-      <translation type="unfinished">Variance</translation>
+      <location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="131"/>
+      <source>Shift Function: </source>
+      <translation type="unfinished">Shift Function: </translation>
     </message>
+  </context>
+  <context>
+    <name>JoystickConfigCalibration</name>
     <message>
-      <location filename="../src/ui/linechart/LinechartWidget.cc" line="213"/>
-      <source>LOG</source>
-      <translation type="unfinished">LOG</translation>
+      <location filename="../src/VehicleSetup/JoystickConfigCalibration.qml" line="207"/>
+      <source>Skip</source>
+      <translation type="unfinished">Skip</translation>
     </message>
     <message>
-      <location filename="../src/ui/linechart/LinechartWidget.cc" line="215"/>
-      <location filename="../src/ui/linechart/LinechartWidget.cc" line="216"/>
-      <source>Set logarithmic scale for Y axis</source>
-      <translation type="unfinished">Set logarithmic scale for Y axis</translation>
+      <location filename="../src/VehicleSetup/JoystickConfigCalibration.qml" line="213"/>
+      <source>Cancel</source>
+      <translation type="unfinished">Cancel</translation>
     </message>
     <message>
-      <location filename="../src/ui/linechart/LinechartWidget.cc" line="221"/>
-      <location filename="../src/ui/linechart/LinechartWidget.cc" line="222"/>
-      <source>Sliding window size to calculate mean and variance</source>
-      <translation type="unfinished">Sliding window size to calculate mean and variance</translation>
+      <location filename="../src/VehicleSetup/JoystickConfigCalibration.qml" line="225"/>
+      <source>Next</source>
+      <translation type="unfinished">Next</translation>
     </message>
     <message>
-      <location filename="../src/ui/linechart/LinechartWidget.cc" line="232"/>
-      <location filename="../src/ui/linechart/LinechartWidget.cc" line="233"/>
-      <source>Start to log curve data into a CSV or TXT file</source>
-      <translation type="unfinished">Start to log curve data into a CSV or TXT file</translation>
+      <location filename="../src/VehicleSetup/JoystickConfigCalibration.qml" line="225"/>
+      <source>Start</source>
+      <translation type="unfinished">Start</translation>
     </message>
+  </context>
+  <context>
+    <name>JoystickConfigController</name>
     <message>
-      <location filename="../src/ui/linechart/LinechartWidget.cc" line="234"/>
-      <source>Start Logging</source>
-      <translation type="unfinished">Start Logging</translation>
+      <location filename="../src/VehicleSetup/JoystickConfigController.cc" line="256"/>
+      <source>Detected %1 joystick axes. To operate PX4, you need at least %2 axes.</source>
+      <translation type="unfinished">Detected %1 joystick axes. To operate PX4, you need at least %2 axes.</translation>
     </message>
+  </context>
+  <context>
+    <name>JoystickConfigGeneral</name>
     <message>
-      <location filename="../src/ui/linechart/LinechartWidget.cc" line="240"/>
-      <source>Ground Time</source>
-      <translation type="unfinished">Ground Time</translation>
+      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="38"/>
+      <source>Enable joystick input</source>
+      <translation type="unfinished">Enable joystick input</translation>
     </message>
     <message>
-      <location filename="../src/ui/linechart/LinechartWidget.cc" line="241"/>
-      <location filename="../src/ui/linechart/LinechartWidget.cc" line="242"/>
-      <source>Overwrite timestamp of data from vehicle with ground receive time. Helps if the plots are not visible because of missing or invalid onboard time.</source>
-      <translation type="unfinished">Overwrite timestamp of data from vehicle with ground receive time. Helps if the plots are not visible because of missing or invalid onboard time.</translation>
+      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="38"/>
+      <source>Enable not allowed (Calibrate First)</source>
+      <translation type="unfinished">Enable not allowed (Calibrate First)</translation>
     </message>
     <message>
-      <location filename="../src/ui/linechart/LinechartWidget.cc" line="249"/>
-      <source>Time axis:</source>
-      <translation type="unfinished">Time axis:</translation>
+      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="67"/>
+      <source>Active joystick:</source>
+      <translation type="unfinished">Active joystick:</translation>
     </message>
     <message>
-      <location filename="../src/ui/linechart/LinechartWidget.cc" line="253"/>
-      <source>10 seconds</source>
-      <translation type="unfinished">10 seconds</translation>
+      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="79"/>
+      <source>Active joystick name not in combo</source>
+      <translation type="unfinished">Active joystick name not in combo</translation>
     </message>
     <message>
-      <location filename="../src/ui/linechart/LinechartWidget.cc" line="254"/>
-      <source>20 seconds</source>
-      <translation type="unfinished">20 seconds</translation>
+      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="97"/>
+      <source>RC Mode:</source>
+      <translation type="unfinished">RC Mode:</translation>
     </message>
     <message>
-      <location filename="../src/ui/linechart/LinechartWidget.cc" line="255"/>
-      <source>30 seconds</source>
-      <translation type="unfinished">30 seconds</translation>
+      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="151"/>
+      <source>Lateral</source>
+      <translation type="unfinished">Lateral</translation>
     </message>
     <message>
-      <location filename="../src/ui/linechart/LinechartWidget.cc" line="256"/>
-      <source>40 seconds</source>
-      <translation type="unfinished">40 seconds</translation>
+      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="151"/>
+      <source>Roll</source>
+      <translation type="unfinished">Roll</translation>
     </message>
     <message>
-      <location filename="../src/ui/linechart/LinechartWidget.cc" line="257"/>
-      <source>50 seconds</source>
-      <translation type="unfinished">50 seconds</translation>
+      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="165"/>
+      <source>Forward</source>
+      <translation type="unfinished">Forward</translation>
     </message>
     <message>
-      <location filename="../src/ui/linechart/LinechartWidget.cc" line="258"/>
-      <source>1 minute</source>
-      <translation type="unfinished">1 minute</translation>
+      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="165"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <location filename="../src/ui/linechart/LinechartWidget.cc" line="259"/>
-      <source>2 minutes</source>
-      <translation type="unfinished">2 minutes</translation>
+      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="178"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
-      <location filename="../src/ui/linechart/LinechartWidget.cc" line="260"/>
-      <source>3 minutes</source>
-      <translation type="unfinished">3 minutes</translation>
+      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="191"/>
+      <source>Throttle</source>
+      <translation type="unfinished">Throttle</translation>
     </message>
     <message>
-      <location filename="../src/ui/linechart/LinechartWidget.cc" line="261"/>
-      <source>4 minutes</source>
-      <translation type="unfinished">4 minutes</translation>
+      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="214"/>
+      <source>Gimbal Pitch</source>
+      <translation type="unfinished">Gimbal Pitch</translation>
     </message>
     <message>
-      <location filename="../src/ui/linechart/LinechartWidget.cc" line="262"/>
-      <source>5 minutes</source>
-      <translation type="unfinished">5 minutes</translation>
+      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="229"/>
+      <source>Gimbal Yaw</source>
+      <translation type="unfinished">Gimbal Yaw</translation>
     </message>
+  </context>
+  <context>
+    <name>JoystickIndicator</name>
     <message>
-      <location filename="../src/ui/linechart/LinechartWidget.cc" line="263"/>
-      <source>10 minutes</source>
-      <translation type="unfinished">10 minutes</translation>
+      <location filename="../src/ui/toolbar/JoystickIndicator.qml" line="47"/>
+      <source>Joystick Status</source>
+      <translation type="unfinished">Joystick Status</translation>
     </message>
     <message>
-      <location filename="../src/ui/linechart/LinechartWidget.cc" line="431"/>
-      <source>No curves selected for logging.</source>
-      <translation type="unfinished">No curves selected for logging.</translation>
+      <location filename="../src/ui/toolbar/JoystickIndicator.qml" line="59"/>
+      <source>Connected:</source>
+      <translation type="unfinished">Connected:</translation>
     </message>
     <message>
-      <location filename="../src/ui/linechart/LinechartWidget.cc" line="432"/>
-      <source>Please check all curves you want to log. Currently no data would be logged. Aborting the logging.</source>
-      <translation type="unfinished">Please check all curves you want to log. Currently no data would be logged. Aborting the logging.</translation>
+      <location filename="../src/ui/toolbar/JoystickIndicator.qml" line="64"/>
+      <source>Enabled:</source>
+      <translation type="unfinished">Enabled:</translation>
     </message>
+  </context>
+  <context>
+    <name>JsonHelper</name>
     <message>
-      <location filename="../src/ui/linechart/LinechartWidget.cc" line="440"/>
-      <source>Save Log File</source>
-      <translation type="unfinished">Save Log File</translation>
+      <location filename="../src/JsonHelper.cc" line="369"/>
+      <source>Unable to open file: &apos;%1&apos;, error: %2</source>
+      <translation type="unfinished">Unable to open file: &apos;%1&apos;, error: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/linechart/LinechartWidget.cc" line="442"/>
-      <source>Log Files (*.log)</source>
-      <translation type="unfinished">Log Files (*.log)</translation>
+      <location filename="../src/JsonHelper.cc" line="378"/>
+      <source>Unable to parse json file: %1 error: %2 offset: %3</source>
+      <translation type="unfinished">Unable to parse json file: %1 error: %2 offset: %3</translation>
     </message>
     <message>
-      <location filename="../src/ui/linechart/LinechartWidget.cc" line="454"/>
-      <source>Stop logging</source>
-      <translation type="unfinished">Stop logging</translation>
+      <location filename="../src/JsonHelper.cc" line="383"/>
+      <source>Root of json file is not object: %1</source>
+      <translation type="unfinished">Root of json file is not object: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/linechart/LinechartWidget.cc" line="473"/>
-      <source>Starting Log Compression</source>
-      <translation type="unfinished">Starting Log Compression</translation>
+      <location filename="../src/JsonHelper.cc" line="390"/>
+      <source>Json file: &apos;%1&apos;. %2</source>
+      <translation type="unfinished">Json file: &apos;%1&apos;. %2</translation>
     </message>
+  </context>
+  <context>
+    <name>KMLHelper</name>
     <message>
-      <location filename="../src/ui/linechart/LinechartWidget.cc" line="474"/>
-      <source>Should empty fields (e.g. due to packet drops) be filled with the previous value of the same variable (zero order hold)?</source>
-      <translation type="unfinished">Should empty fields (e.g. due to packet drops) be filled with the previous value of the same variable (zero order hold)?</translation>
+      <location filename="../src/KMLHelper.cc" line="15"/>
+      <source>KML file load failed. %1</source>
+      <translation type="unfinished">KML file load failed. %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/linechart/LinechartWidget.cc" line="481"/>
-      <source>Start logging</source>
-      <translation type="unfinished">Start logging</translation>
+      <location filename="../src/KMLHelper.cc" line="24"/>
+      <source>File not found: %1</source>
+      <translation type="unfinished">File not found: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/linechart/LinechartWidget.cc" line="518"/>
-      <location filename="../src/ui/linechart/LinechartWidget.cc" line="519"/>
-      <source>Enable the curve in the graph window</source>
-      <translation type="unfinished">Enable the curve in the graph window</translation>
+      <location filename="../src/KMLHelper.cc" line="29"/>
+      <source>Unable to open file: %1 error: $%2</source>
+      <translation type="unfinished">Unable to open file: %1 error: $%2</translation>
     </message>
     <message>
-      <location filename="../src/ui/linechart/LinechartWidget.cc" line="540"/>
-      <location filename="../src/ui/linechart/LinechartWidget.cc" line="541"/>
-      <source>Current value of %1 in %2 units</source>
-      <translation type="unfinished">Current value of %1 in %2 units</translation>
+      <location filename="../src/KMLHelper.cc" line="37"/>
+      <source>Unable to parse KML file: %1 error: %2 line: %3</source>
+      <translation type="unfinished">Unable to parse KML file: %1 error: %2 line: %3</translation>
     </message>
     <message>
-      <location filename="../src/ui/linechart/LinechartWidget.cc" line="548"/>
-      <location filename="../src/ui/linechart/LinechartWidget.cc" line="549"/>
-      <source>Unit of </source>
-      <translation type="unfinished">Unit of </translation>
+      <location filename="../src/KMLHelper.cc" line="61"/>
+      <source>No supported type found in KML file.</source>
+      <translation type="unfinished">No supported type found in KML file.</translation>
     </message>
     <message>
-      <location filename="../src/ui/linechart/LinechartWidget.cc" line="559"/>
-      <location filename="../src/ui/linechart/LinechartWidget.cc" line="560"/>
-      <source>Arithmetic mean of %1 in %2 units</source>
-      <translation type="unfinished">Arithmetic mean of %1 in %2 units</translation>
+      <location filename="../src/KMLHelper.cc" line="77"/>
+      <source>Unable to find Polygon node in KML</source>
+      <translation type="unfinished">Unable to find Polygon node in KML</translation>
     </message>
     <message>
-      <location filename="../src/ui/linechart/LinechartWidget.cc" line="574"/>
-      <location filename="../src/ui/linechart/LinechartWidget.cc" line="575"/>
-      <source>Variance of %1 in (%2)^2 units</source>
-      <translation type="unfinished">Variance of %1 in (%2)^2 units</translation>
+      <location filename="../src/KMLHelper.cc" line="83"/>
+      <location filename="../src/KMLHelper.cc" line="144"/>
+      <source>Internal error: Unable to find coordinates node in KML</source>
+      <translation type="unfinished">Internal error: Unable to find coordinates node in KML</translation>
+    </message>
+    <message>
+      <location filename="../src/KMLHelper.cc" line="138"/>
+      <source>Unable to find LineString node in KML</source>
+      <translation type="unfinished">Unable to find LineString node in KML</translation>
+    </message>
+  </context>
+  <context>
+    <name>KMLOrSHPFileDialog</name>
+    <message>
+      <location filename="../src/QmlControls/KMLOrSHPFileDialog.qml" line="19"/>
+      <source>Select Polygon File</source>
+      <translation type="unfinished">Select Polygon File</translation>
     </message>
   </context>
   <context>
     <name>LinkIndicator</name>
     <message>
-      <location filename="../src/ui/toolbar/LinkIndicator.qml" line="33"/>
+      <location filename="../src/ui/toolbar/LinkIndicator.qml" line="32"/>
       <source>N/A</source>
       <comment>No data to display</comment>
       <translation type="unfinished">N/A</translation>
@@ -7773,50 +8478,51 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
       <translation type="unfinished">Connect not allowed: %1</translation>
     </message>
     <message>
-      <location filename="../src/comm/LinkManager.cc" line="582"/>
-      <location filename="../src/comm/LinkManager.cc" line="588"/>
-      <location filename="../src/comm/LinkManager.cc" line="593"/>
-      <location filename="../src/comm/LinkManager.cc" line="598"/>
+      <location filename="../src/comm/LinkManager.cc" line="580"/>
+      <location filename="../src/comm/LinkManager.cc" line="586"/>
+      <location filename="../src/comm/LinkManager.cc" line="591"/>
+      <location filename="../src/comm/LinkManager.cc" line="596"/>
       <source>%1 on %2 (AutoConnect)</source>
       <translation type="unfinished">%1 on %2 (AutoConnect)</translation>
     </message>
     <message>
-      <location filename="../src/comm/LinkManager.cc" line="685"/>
+      <location filename="../src/comm/LinkManager.cc" line="683"/>
       <source>Shutdown</source>
       <translation type="unfinished">Shutdown</translation>
     </message>
     <message>
-      <location filename="../src/comm/LinkManager.cc" line="696"/>
+      <location filename="../src/comm/LinkManager.cc" line="694"/>
       <source>Serial</source>
       <translation type="unfinished">Serial</translation>
     </message>
     <message>
-      <location filename="../src/comm/LinkManager.cc" line="698"/>
+      <location filename="../src/comm/LinkManager.cc" line="696"/>
       <source>UDP</source>
       <translation type="unfinished">UDP</translation>
     </message>
     <message>
-      <location filename="../src/comm/LinkManager.cc" line="699"/>
+      <location filename="../src/comm/LinkManager.cc" line="697"/>
       <source>TCP</source>
       <translation type="unfinished">TCP</translation>
     </message>
     <message>
-      <location filename="../src/comm/LinkManager.cc" line="704"/>
+      <location filename="../src/comm/LinkManager.cc" line="702"/>
       <source>Mock Link</source>
       <translation type="unfinished">Mock Link</translation>
     </message>
     <message>
-      <location filename="../src/comm/LinkManager.cc" line="707"/>
+      <location filename="../src/comm/LinkManager.cc" line="705"/>
+      <location filename="../src/comm/LinkManager.cc" line="1018"/>
       <source>Log Replay</source>
       <translation type="unfinished">Log Replay</translation>
     </message>
     <message>
-      <location filename="../src/comm/LinkManager.cc" line="940"/>
+      <location filename="../src/comm/LinkManager.cc" line="937"/>
       <source>Please check to make sure you have an SD Card inserted in your Vehicle and try again.</source>
       <translation type="unfinished">Please check to make sure you have an SD Card inserted in your Vehicle and try again.</translation>
     </message>
     <message>
-      <location filename="../src/comm/LinkManager.cc" line="941"/>
+      <location filename="../src/comm/LinkManager.cc" line="938"/>
       <source>Your Vehicle is not responding. If this continues, shutdown %1, restart the Vehicle letting it boot completely, then start %1.</source>
       <translation type="unfinished">Your Vehicle is not responding. If this continues, shutdown %1, restart the Vehicle letting it boot completely, then start %1.</translation>
     </message>
@@ -7824,82 +8530,82 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
   <context>
     <name>LinkSettings</name>
     <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="88"/>
+      <location filename="../src/ui/preferences/LinkSettings.qml" line="87"/>
       <source>Delete</source>
       <translation type="unfinished">Delete</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="99"/>
+      <location filename="../src/ui/preferences/LinkSettings.qml" line="98"/>
       <source>Remove Link Configuration</source>
       <translation type="unfinished">Remove Link Configuration</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="100"/>
+      <location filename="../src/ui/preferences/LinkSettings.qml" line="99"/>
       <source>Remove %1. Is this really what you want?</source>
       <translation type="unfinished">Remove %1. Is this really what you want?</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="112"/>
+      <location filename="../src/ui/preferences/LinkSettings.qml" line="111"/>
       <source>Edit</source>
       <translation type="unfinished">Edit</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="119"/>
+      <location filename="../src/ui/preferences/LinkSettings.qml" line="118"/>
       <source>Add</source>
       <translation type="unfinished">Add</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="125"/>
+      <location filename="../src/ui/preferences/LinkSettings.qml" line="124"/>
       <source>Connect</source>
       <translation type="unfinished">Connect</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="132"/>
+      <location filename="../src/ui/preferences/LinkSettings.qml" line="131"/>
       <source>Disconnect</source>
       <translation type="unfinished">Disconnect</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="180"/>
+      <location filename="../src/ui/preferences/LinkSettings.qml" line="179"/>
       <source>Edit Link Configuration Settings</source>
       <translation type="unfinished">Edit Link Configuration Settings</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="180"/>
+      <location filename="../src/ui/preferences/LinkSettings.qml" line="179"/>
       <source>Create New Link Configuration</source>
       <translation type="unfinished">Create New Link Configuration</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="214"/>
+      <location filename="../src/ui/preferences/LinkSettings.qml" line="213"/>
       <source>General</source>
       <translation type="unfinished">General</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="232"/>
+      <location filename="../src/ui/preferences/LinkSettings.qml" line="231"/>
       <source>Name:</source>
       <translation type="unfinished">Name:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="246"/>
+      <location filename="../src/ui/preferences/LinkSettings.qml" line="245"/>
       <source>Type:</source>
       <translation type="unfinished">Type:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="303"/>
+      <location filename="../src/ui/preferences/LinkSettings.qml" line="302"/>
       <source>Automatically Connect on Start</source>
       <translation type="unfinished">Automatically Connect on Start</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="317"/>
+      <location filename="../src/ui/preferences/LinkSettings.qml" line="316"/>
       <source>High Latency</source>
       <translation type="unfinished">High Latency</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="377"/>
+      <location filename="../src/ui/preferences/LinkSettings.qml" line="376"/>
       <source>OK</source>
       <translation type="unfinished">OK</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="397"/>
+      <location filename="../src/ui/preferences/LinkSettings.qml" line="396"/>
       <source>Cancel</source>
       <translation type="unfinished">Cancel</translation>
     </message>
@@ -7936,34 +8642,34 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
     </message>
     <message>
       <location filename="../src/AnalyzeView/LogDownloadController.cc" line="227"/>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="689"/>
+      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="690"/>
       <source>Canceled</source>
       <translation type="unfinished">Canceled</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/LogDownloadController.cc" line="274"/>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="379"/>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="635"/>
+      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="385"/>
+      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="636"/>
       <source>Error</source>
       <translation type="unfinished">Error</translation>
     </message>
     <message>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="360"/>
+      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="366"/>
       <source>Downloaded</source>
       <translation type="unfinished">Downloaded</translation>
     </message>
     <message>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="426"/>
+      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="436"/>
       <source>Timed Out</source>
       <translation type="unfinished">Timed Out</translation>
     </message>
     <message>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="544"/>
+      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="546"/>
       <source>Waiting</source>
       <translation type="unfinished">Waiting</translation>
     </message>
     <message>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="590"/>
+      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="591"/>
       <source>UnknownDate</source>
       <translation type="unfinished">UnknownDate</translation>
     </message>
@@ -8026,27 +8732,27 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
       <translation type="unfinished">Download</translation>
     </message>
     <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="150"/>
+      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="154"/>
       <source>Select save directory</source>
       <translation type="unfinished">Select save directory</translation>
     </message>
     <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="166"/>
+      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="171"/>
       <source>Erase All</source>
       <translation type="unfinished">Erase All</translation>
     </message>
     <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="170"/>
+      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="175"/>
       <source>Delete All Log Files</source>
       <translation type="unfinished">Delete All Log Files</translation>
     </message>
     <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="176"/>
+      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="181"/>
       <source>All log files will be erased permanently. Is this really what you want?</source>
       <translation type="unfinished">All log files will be erased permanently. Is this really what you want?</translation>
     </message>
     <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="184"/>
+      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="190"/>
       <source>Cancel</source>
       <translation type="unfinished">Cancel</translation>
     </message>
@@ -8064,29 +8770,28 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
       <translation type="unfinished">You must close all connections prior to replaying a log.</translation>
     </message>
     <message>
-      <location filename="../src/comm/LogReplayLink.cc" line="247"/>
+      <location filename="../src/comm/LogReplayLink.cc" line="276"/>
       <source>Attempt to load new log while log being played</source>
       <translation type="unfinished">Attempt to load new log while log being played</translation>
     </message>
     <message>
-      <location filename="../src/comm/LogReplayLink.cc" line="253"/>
+      <location filename="../src/comm/LogReplayLink.cc" line="282"/>
       <source>Unable to open log file: &apos;%1&apos;, error: %2</source>
       <translation type="unfinished">Unable to open log file: &apos;%1&apos;, error: %2</translation>
     </message>
     <message>
-      <location filename="../src/comm/LogReplayLink.cc" line="283"/>
-      <source>The log file &apos;%1&apos; is corrupt. No valid timestamps were found at the end of the file.</source>
-      <translation type="unfinished">The log file &apos;%1&apos; is corrupt. No valid timestamps were found at the end of the file.</translation>
+      <location filename="../src/comm/LogReplayLink.cc" line="292"/>
+      <source>The log file &apos;%1&apos; is corrupt or empty.</source>
+      <translation type="unfinished">The log file &apos;%1&apos; is corrupt or empty.</translation>
     </message>
     <message>
-      <location filename="../src/comm/LogReplayLink.cc" line="398"/>
+      <location filename="../src/comm/LogReplayLink.cc" line="365"/>
       <source>Connect not allowed during Flight Data replay.</source>
       <translation type="unfinished">Connect not allowed during Flight Data replay.</translation>
     </message>
     <message>
-      <location filename="../src/comm/LogReplayLink.cc" line="476"/>
-      <location filename="../src/comm/LogReplayLink.cc" line="496"/>
-      <location filename="../src/comm/LogReplayLink.cc" line="516"/>
+      <location filename="../src/comm/LogReplayLink.cc" line="432"/>
+      <location filename="../src/comm/LogReplayLink.cc" line="452"/>
       <source>Unable to seek to new position</source>
       <translation type="unfinished">Unable to seek to new position</translation>
     </message>
@@ -8094,11 +8799,24 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
   <context>
     <name>LogReplayLinkConfiguration</name>
     <message>
-      <location filename="../src/comm/LogReplayLink.h" line="43"/>
+      <location filename="../src/comm/LogReplayLink.h" line="40"/>
       <source>Log Replay Link Settings</source>
       <translation type="unfinished">Log Replay Link Settings</translation>
     </message>
   </context>
+  <context>
+    <name>LogReplayLinkController</name>
+    <message>
+      <location filename="../src/comm/LogReplayLink.cc" line="600"/>
+      <source>%2m:%3s</source>
+      <translation type="unfinished">%2m:%3s</translation>
+    </message>
+    <message>
+      <location filename="../src/comm/LogReplayLink.cc" line="602"/>
+      <source>%1h:%2m:%3s</source>
+      <translation type="unfinished">%1h:%2m:%3s</translation>
+    </message>
+  </context>
   <context>
     <name>LogReplaySettings</name>
     <message>
@@ -8117,12 +8835,138 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
       <translation type="unfinished">Please choose a file</translation>
     </message>
   </context>
+  <context>
+    <name>LogReplayStatusBar</name>
+    <message>
+      <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="19"/>
+      <source>Log Replay</source>
+      <translation type="unfinished">Log Replay</translation>
+    </message>
+    <message>
+      <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="19"/>
+      <source>You must close all connections prior to replaying a log.</source>
+      <translation type="unfinished">You must close all connections prior to replaying a log.</translation>
+    </message>
+    <message>
+      <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="30"/>
+      <source>Select Telemetery Log</source>
+      <translation type="unfinished">Select Telemetery Log</translation>
+    </message>
+    <message>
+      <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="31"/>
+      <source>Telemetry Logs (*.%1)</source>
+      <translation type="unfinished">Telemetry Logs (*.%1)</translation>
+    </message>
+    <message>
+      <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="31"/>
+      <source>All Files (*)</source>
+      <translation type="unfinished">All Files (*)</translation>
+    </message>
+    <message>
+      <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="54"/>
+      <source>Pause</source>
+      <translation type="unfinished">Pause</translation>
+    </message>
+    <message>
+      <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="54"/>
+      <source>Play</source>
+      <translation type="unfinished">Play</translation>
+    </message>
+    <message>
+      <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="102"/>
+      <source>Load Telemetry Log</source>
+      <translation type="unfinished">Load Telemetry Log</translation>
+    </message>
+  </context>
+  <context>
+    <name>MAVLinkChart</name>
+    <message>
+      <location filename="../src/QmlControls/MAVLinkChart.qml" line="91"/>
+      <source>Scale:</source>
+      <translation type="unfinished">Scale:</translation>
+    </message>
+    <message>
+      <location filename="../src/QmlControls/MAVLinkChart.qml" line="104"/>
+      <source>Range:</source>
+      <translation type="unfinished">Range:</translation>
+    </message>
+  </context>
   <context>
     <name>MAVLinkInspectorController</name>
     <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="412"/>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="425"/>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="441"/>
+      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="729"/>
+      <source>5 Sec</source>
+      <translation type="unfinished">5 Sec</translation>
+    </message>
+    <message>
+      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="730"/>
+      <source>10 Sec</source>
+      <translation type="unfinished">10 Sec</translation>
+    </message>
+    <message>
+      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="731"/>
+      <source>30 Sec</source>
+      <translation type="unfinished">30 Sec</translation>
+    </message>
+    <message>
+      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="732"/>
+      <source>60 Sec</source>
+      <translation type="unfinished">60 Sec</translation>
+    </message>
+    <message>
+      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="734"/>
+      <source>Auto</source>
+      <translation type="unfinished">Auto</translation>
+    </message>
+    <message>
+      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="735"/>
+      <source>10,000</source>
+      <translation type="unfinished">10,000</translation>
+    </message>
+    <message>
+      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="736"/>
+      <source>1,000</source>
+      <translation type="unfinished">1,000</translation>
+    </message>
+    <message>
+      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="737"/>
+      <source>100</source>
+      <translation type="unfinished">100</translation>
+    </message>
+    <message>
+      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="738"/>
+      <source>10</source>
+      <translation type="unfinished">10</translation>
+    </message>
+    <message>
+      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="739"/>
+      <source>1</source>
+      <translation type="unfinished">1</translation>
+    </message>
+    <message>
+      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="740"/>
+      <source>0.1</source>
+      <translation type="unfinished">0.1</translation>
+    </message>
+    <message>
+      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="741"/>
+      <source>0.01</source>
+      <translation type="unfinished">0.01</translation>
+    </message>
+    <message>
+      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="742"/>
+      <source>0.001</source>
+      <translation type="unfinished">0.001</translation>
+    </message>
+    <message>
+      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="743"/>
+      <source>0.0001</source>
+      <translation type="unfinished">0.0001</translation>
+    </message>
+    <message>
+      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="838"/>
+      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="851"/>
+      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="866"/>
       <source>Vehicle %1</source>
       <translation type="unfinished">Vehicle %1</translation>
     </message>
@@ -8130,57 +8974,84 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
   <context>
     <name>MAVLinkInspectorPage</name>
     <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="40"/>
+      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="44"/>
       <source>Inspect real time MAVLink messages.</source>
       <translation type="unfinished">Inspect real time MAVLink messages.</translation>
     </message>
     <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="89"/>
+      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="50"/>
+      <source>Component ID:</source>
+      <translation type="unfinished">Component ID:</translation>
+    </message>
+    <message>
+      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="123"/>
       <source>Message:</source>
       <translation type="unfinished">Message:</translation>
     </message>
     <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="97"/>
+      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="131"/>
       <source>Component:</source>
       <translation type="unfinished">Component:</translation>
     </message>
     <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="103"/>
+      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="137"/>
       <source>Count:</source>
       <translation type="unfinished">Count:</translation>
     </message>
     <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="111"/>
-      <source>Message Fields:</source>
-      <translation type="unfinished">Message Fields:</translation>
+      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="152"/>
+      <source>Name</source>
+      <translation type="unfinished">Name</translation>
+    </message>
+    <message>
+      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="155"/>
+      <source>Value</source>
+      <translation type="unfinished">Value</translation>
+    </message>
+    <message>
+      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="158"/>
+      <source>Type</source>
+      <translation type="unfinished">Type</translation>
+    </message>
+    <message>
+      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="161"/>
+      <source>Plot 1</source>
+      <translation type="unfinished">Plot 1</translation>
+    </message>
+    <message>
+      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="164"/>
+      <source>Plot 2</source>
+      <translation type="unfinished">Plot 2</translation>
     </message>
   </context>
   <context>
     <name>MAVLinkProtocol</name>
     <message>
-      <location filename="../src/comm/MAVLinkProtocol.cc" line="261"/>
-      <location filename="../src/comm/MAVLinkProtocol.cc" line="301"/>
-      <location filename="../src/comm/MAVLinkProtocol.cc" line="422"/>
+      <location filename="../src/comm/MAVLinkProtocol.cc" line="186"/>
+      <location filename="../src/comm/MAVLinkProtocol.cc" line="293"/>
+      <location filename="../src/comm/MAVLinkProtocol.cc" line="338"/>
+      <location filename="../src/comm/MAVLinkProtocol.cc" line="460"/>
       <source>MAVLink Protocol</source>
       <translation type="unfinished">MAVLink Protocol</translation>
     </message>
     <message>
-      <location filename="../src/comm/MAVLinkProtocol.cc" line="261"/>
+      <location filename="../src/comm/MAVLinkProtocol.cc" line="186"/>
+      <location filename="../src/comm/MAVLinkProtocol.cc" line="293"/>
       <source>MAVLink Logging failed. Could not write to file %1, logging disabled.</source>
       <translation type="unfinished">MAVLink Logging failed. Could not write to file %1, logging disabled.</translation>
     </message>
     <message>
-      <location filename="../src/comm/MAVLinkProtocol.cc" line="301"/>
+      <location filename="../src/comm/MAVLinkProtocol.cc" line="338"/>
       <source>Detected radio still using MAVLink v1.0 on a link with MAVLink v2.0 enabled. Please upgrade the radio firmware.</source>
       <translation type="unfinished">Detected radio still using MAVLink v1.0 on a link with MAVLink v2.0 enabled. Please upgrade the radio firmware.</translation>
     </message>
     <message>
-      <location filename="../src/comm/MAVLinkProtocol.cc" line="348"/>
+      <location filename="../src/comm/MAVLinkProtocol.cc" line="386"/>
       <source>MAVLink protocol</source>
       <translation type="unfinished">MAVLink protocol</translation>
     </message>
     <message>
-      <location filename="../src/comm/MAVLinkProtocol.cc" line="422"/>
+      <location filename="../src/comm/MAVLinkProtocol.cc" line="460"/>
       <source>Opening Flight Data file for writing failed. Unable to write to %1. Please choose a different file location.</source>
       <translation type="unfinished">Opening Flight Data file for writing failed. Unable to write to %1. Please choose a different file location.</translation>
     </message>
@@ -8188,33 +9059,39 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
   <context>
     <name>MainRootWindow</name>
     <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="213"/>
-      <location filename="../src/ui/MainRootWindow.qml" line="240"/>
+      <location filename="../src/ui/MainRootWindow.qml" line="297"/>
+      <location filename="../src/ui/MainRootWindow.qml" line="314"/>
+      <location filename="../src/ui/MainRootWindow.qml" line="333"/>
       <source>%1 close</source>
       <translation type="unfinished">%1 close</translation>
     </message>
     <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="214"/>
+      <location filename="../src/ui/MainRootWindow.qml" line="334"/>
       <source>There are still active connections to vehicles. Are you sure you want to exit?</source>
       <translation type="unfinished">There are still active connections to vehicles. Are you sure you want to exit?</translation>
     </message>
     <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="241"/>
+      <location filename="../src/ui/MainRootWindow.qml" line="298"/>
       <source>You have a mission edit in progress which has not been saved/sent. If you close you will lose changes. Are you sure you want to close?</source>
       <translation type="unfinished">You have a mission edit in progress which has not been saved/sent. If you close you will lose changes. Are you sure you want to close?</translation>
     </message>
     <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="364"/>
+      <location filename="../src/ui/MainRootWindow.qml" line="315"/>
+      <source>You have pending parameter updates to a vehicle. If you close you will lose changes. Are you sure you want to close?</source>
+      <translation type="unfinished">You have pending parameter updates to a vehicle. If you close you will lose changes. Are you sure you want to close?</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/MainRootWindow.qml" line="457"/>
       <source>No Messages</source>
       <translation type="unfinished">No Messages</translation>
     </message>
     <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="471"/>
+      <location filename="../src/ui/MainRootWindow.qml" line="564"/>
       <source>Parameters missing: %1</source>
       <translation type="unfinished">Parameters missing: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="475"/>
+      <location filename="../src/ui/MainRootWindow.qml" line="568"/>
       <source>Fact error: %1</source>
       <translation type="unfinished">Fact error: %1</translation>
     </message>
@@ -8222,35 +9099,32 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
   <context>
     <name>MainToolBar</name>
     <message>
-      <location filename="../src/ui/toolbar/MainToolBar.qml" line="179"/>
+      <location filename="../src/ui/toolbar/MainToolBar.qml" line="181"/>
+      <source>Advanced Mode</source>
+      <translation type="unfinished">Advanced Mode</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/toolbar/MainToolBar.qml" line="337"/>
       <source>Downloading Parameters</source>
       <translation type="unfinished">Downloading Parameters</translation>
     </message>
     <message>
-      <location filename="../src/ui/toolbar/MainToolBar.qml" line="187"/>
+      <location filename="../src/ui/toolbar/MainToolBar.qml" line="345"/>
       <source>Click anywhere to hide</source>
       <translation type="unfinished">Click anywhere to hide</translation>
     </message>
-  </context>
-  <context>
-    <name>MainToolBarIndicators</name>
     <message>
-      <location filename="../src/ui/toolbar/MainToolBarIndicators.qml" line="52"/>
-      <source>Advanced Mode</source>
-      <translation type="unfinished">Advanced Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainToolBarIndicators.qml" line="67"/>
+      <location filename="../src/ui/toolbar/MainToolBar.qml" line="362"/>
       <source>Waiting For Vehicle Connection</source>
       <translation type="unfinished">Waiting For Vehicle Connection</translation>
     </message>
     <message>
-      <location filename="../src/ui/toolbar/MainToolBarIndicators.qml" line="141"/>
+      <location filename="../src/ui/toolbar/MainToolBar.qml" line="384"/>
       <source>Disconnect</source>
       <translation type="unfinished">Disconnect</translation>
     </message>
     <message>
-      <location filename="../src/ui/toolbar/MainToolBarIndicators.qml" line="149"/>
+      <location filename="../src/ui/toolbar/MainToolBar.qml" line="392"/>
       <source>COMMUNICATION LOST</source>
       <translation type="unfinished">COMMUNICATION LOST</translation>
     </message>
@@ -8258,30 +9132,45 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
   <context>
     <name>MapScale</name>
     <message>
-      <location filename="../src/FlightMap/MapScale.qml" line="40"/>
+      <location filename="../src/FlightMap/MapScale.qml" line="46"/>
       <source> km</source>
       <translation type="unfinished"> km</translation>
     </message>
     <message>
-      <location filename="../src/FlightMap/MapScale.qml" line="42"/>
+      <location filename="../src/FlightMap/MapScale.qml" line="48"/>
       <source> m</source>
       <translation type="unfinished"> m</translation>
     </message>
     <message>
-      <location filename="../src/FlightMap/MapScale.qml" line="53"/>
+      <location filename="../src/FlightMap/MapScale.qml" line="59"/>
       <source> mile</source>
       <translation type="unfinished"> mile</translation>
     </message>
     <message>
-      <location filename="../src/FlightMap/MapScale.qml" line="55"/>
+      <location filename="../src/FlightMap/MapScale.qml" line="61"/>
       <source> miles</source>
       <translation type="unfinished"> miles</translation>
     </message>
     <message>
-      <location filename="../src/FlightMap/MapScale.qml" line="58"/>
+      <location filename="../src/FlightMap/MapScale.qml" line="64"/>
       <source> ft</source>
       <translation type="unfinished"> ft</translation>
     </message>
+    <message>
+      <location filename="../src/FlightMap/MapScale.qml" line="193"/>
+      <source>T</source>
+      <translation type="unfinished">T</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightMap/MapScale.qml" line="206"/>
+      <source>+</source>
+      <translation type="unfinished">+</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightMap/MapScale.qml" line="219"/>
+      <source>-</source>
+      <translation type="unfinished">-</translation>
+    </message>
   </context>
   <context>
     <name>MavlinkConsolePage</name>
@@ -8472,92 +9361,92 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
       <translation type="unfinished">Wind Speed:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="547"/>
+      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="548"/>
       <source>Flight Rating:</source>
       <translation type="unfinished">Flight Rating:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="584"/>
+      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="586"/>
       <source>Additional Feedback:</source>
       <translation type="unfinished">Additional Feedback:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="603"/>
+      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="605"/>
       <source>Make this log publicly available</source>
       <translation type="unfinished">Make this log publicly available</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="614"/>
+      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="616"/>
       <source>Enable automatic log uploads</source>
       <translation type="unfinished">Enable automatic log uploads</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="626"/>
+      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="628"/>
       <source>Delete log file after uploading</source>
       <translation type="unfinished">Delete log file after uploading</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="645"/>
+      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="647"/>
       <source>Saved Log Files</source>
       <translation type="unfinished">Saved Log Files</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="708"/>
+      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="710"/>
       <source>Uploaded</source>
       <translation type="unfinished">Uploaded</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="731"/>
+      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="733"/>
       <source>Check All</source>
       <translation type="unfinished">Check All</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="741"/>
+      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="743"/>
       <source>Check None</source>
       <translation type="unfinished">Check None</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="751"/>
+      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="753"/>
       <source>Delete Selected</source>
       <translation type="unfinished">Delete Selected</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="759"/>
+      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="761"/>
       <source>Delete Selected Log Files</source>
       <translation type="unfinished">Delete Selected Log Files</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="760"/>
+      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="762"/>
       <source>Confirm deleting selected log files?</source>
       <translation type="unfinished">Confirm deleting selected log files?</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="767"/>
+      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="769"/>
       <source>Upload Selected</source>
       <translation type="unfinished">Upload Selected</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="782"/>
+      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="784"/>
       <source>Upload Selected Log Files</source>
       <translation type="unfinished">Upload Selected Log Files</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="783"/>
+      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="785"/>
       <source>Confirm uploading selected log files?</source>
       <translation type="unfinished">Confirm uploading selected log files?</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="790"/>
+      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="792"/>
       <source>Cancel</source>
       <translation type="unfinished">Cancel</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="799"/>
+      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="801"/>
       <source>Cancel Upload</source>
       <translation type="unfinished">Cancel Upload</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="800"/>
+      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="802"/>
       <source>Confirm canceling the upload process?</source>
       <translation type="unfinished">Confirm canceling the upload process?</translation>
     </message>
@@ -8585,64 +9474,75 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
       <translation type="unfinished">Ground Unit:</translation>
     </message>
     <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="124"/>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="132"/>
+      <location filename="../src/Microhard/MicrohardSettings.qml" line="126"/>
+      <location filename="../src/Microhard/MicrohardSettings.qml" line="142"/>
       <source>Connected</source>
       <translation type="unfinished">Connected</translation>
     </message>
     <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="124"/>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="132"/>
+      <location filename="../src/Microhard/MicrohardSettings.qml" line="128"/>
+      <location filename="../src/Microhard/MicrohardSettings.qml" line="144"/>
+      <source>Login Error</source>
+      <translation type="unfinished">Login Error</translation>
+    </message>
+    <message>
+      <location filename="../src/Microhard/MicrohardSettings.qml" line="130"/>
+      <location filename="../src/Microhard/MicrohardSettings.qml" line="146"/>
       <source>Not Connected</source>
       <translation type="unfinished">Not Connected</translation>
     </message>
     <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="129"/>
+      <location filename="../src/Microhard/MicrohardSettings.qml" line="137"/>
       <source>Air Unit:</source>
       <translation type="unfinished">Air Unit:</translation>
     </message>
     <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="136"/>
+      <location filename="../src/Microhard/MicrohardSettings.qml" line="152"/>
       <source>Uplink RSSI:</source>
       <translation type="unfinished">Uplink RSSI:</translation>
     </message>
     <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="142"/>
+      <location filename="../src/Microhard/MicrohardSettings.qml" line="158"/>
       <source>Downlink RSSI:</source>
       <translation type="unfinished">Downlink RSSI:</translation>
     </message>
     <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="160"/>
+      <location filename="../src/Microhard/MicrohardSettings.qml" line="176"/>
       <source>Network Settings</source>
       <translation type="unfinished">Network Settings</translation>
     </message>
     <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="182"/>
+      <location filename="../src/Microhard/MicrohardSettings.qml" line="198"/>
       <source>Local IP Address:</source>
       <translation type="unfinished">Local IP Address:</translation>
     </message>
     <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="193"/>
+      <location filename="../src/Microhard/MicrohardSettings.qml" line="209"/>
       <source>Remote IP Address:</source>
       <translation type="unfinished">Remote IP Address:</translation>
     </message>
     <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="203"/>
+      <location filename="../src/Microhard/MicrohardSettings.qml" line="219"/>
       <source>Network Mask:</source>
       <translation type="unfinished">Network Mask:</translation>
     </message>
     <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="213"/>
-      <source>Configuration password:</source>
-      <translation type="unfinished">Configuration password:</translation>
+      <location filename="../src/Microhard/MicrohardSettings.qml" line="229"/>
+      <source>Configuration User Name:</source>
+      <translation type="unfinished">Configuration User Name:</translation>
     </message>
     <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="223"/>
+      <location filename="../src/Microhard/MicrohardSettings.qml" line="238"/>
+      <source>Configuration Password:</source>
+      <translation type="unfinished">Configuration Password:</translation>
+    </message>
+    <message>
+      <location filename="../src/Microhard/MicrohardSettings.qml" line="248"/>
       <source>Encryption key:</source>
       <translation type="unfinished">Encryption key:</translation>
     </message>
     <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="256"/>
+      <location filename="../src/Microhard/MicrohardSettings.qml" line="282"/>
       <source>Apply</source>
       <translation type="unfinished">Apply</translation>
     </message>
@@ -8650,7 +9550,7 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
   <context>
     <name>MissionCommandDialog</name>
     <message>
-      <location filename="../src/QmlControls/MissionCommandDialog.qml" line="31"/>
+      <location filename="../src/QmlControls/MissionCommandDialog.qml" line="33"/>
       <source>Category:</source>
       <translation type="unfinished">Category:</translation>
     </message>
@@ -8658,7 +9558,7 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
   <context>
     <name>MissionCommandTree</name>
     <message>
-      <location filename="../src/MissionManager/MissionCommandTree.cc" line="26"/>
+      <location filename="../src/MissionManager/MissionCommandTree.cc" line="25"/>
       <source>All commands</source>
       <translation type="unfinished">All commands</translation>
     </message>
@@ -8666,64 +9566,39 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
   <context>
     <name>MissionController</name>
     <message>
-      <location filename="../src/MissionManager/MissionController.cc" line="54"/>
-      <source>Fixed Wing Landing</source>
-      <translation type="unfinished">Fixed Wing Landing</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/MissionController.cc" line="55"/>
-      <source>Structure Scan</source>
-      <translation type="unfinished">Structure Scan</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/MissionController.cc" line="56"/>
-      <source>Corridor Scan</source>
-      <translation type="unfinished">Corridor Scan</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/MissionController.cc" line="67"/>
-      <source>Survey</source>
-      <translation type="unfinished">Survey</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/MissionController.cc" line="225"/>
-      <source>Warning: You are using MAV_FRAME_GLOBAL_TERRAIN_ALT in a mission. %1 does not support sending terrain tiles to vehicle.</source>
-      <translation type="unfinished">Warning: You are using MAV_FRAME_GLOBAL_TERRAIN_ALT in a mission. %1 does not support sending terrain tiles to vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/MissionController.cc" line="705"/>
+      <location filename="../src/MissionManager/MissionController.cc" line="745"/>
       <source>Mission item %1 is not an object</source>
       <translation type="unfinished">Mission item %1 is not an object</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/MissionController.cc" line="784"/>
+      <location filename="../src/MissionManager/MissionController.cc" line="831"/>
       <source>Unsupported complex item type: %1</source>
       <translation type="unfinished">Unsupported complex item type: %1</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/MissionController.cc" line="787"/>
+      <location filename="../src/MissionManager/MissionController.cc" line="834"/>
       <source>Unknown item type: %1</source>
       <translation type="unfinished">Unknown item type: %1</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/MissionController.cc" line="810"/>
+      <location filename="../src/MissionManager/MissionController.cc" line="857"/>
       <source>Could not find doJumpId: %1</source>
       <translation type="unfinished">Could not find doJumpId: %1</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/MissionController.cc" line="879"/>
+      <location filename="../src/MissionManager/MissionController.cc" line="930"/>
       <source>The mission file is corrupted.</source>
       <translation type="unfinished">The mission file is corrupted.</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/MissionController.cc" line="884"/>
+      <location filename="../src/MissionManager/MissionController.cc" line="935"/>
       <source>The mission file is not compatible with this version of %1.</source>
       <translation type="unfinished">The mission file is not compatible with this version of %1.</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/MissionController.cc" line="923"/>
-      <location filename="../src/MissionManager/MissionController.cc" line="938"/>
-      <location filename="../src/MissionManager/MissionController.cc" line="962"/>
+      <location filename="../src/MissionManager/MissionController.cc" line="976"/>
+      <location filename="../src/MissionManager/MissionController.cc" line="991"/>
+      <location filename="../src/MissionManager/MissionController.cc" line="1015"/>
       <source>Mission: %1</source>
       <translation type="unfinished">Mission: %1</translation>
     </message>
@@ -8749,57 +9624,53 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
   <context>
     <name>MissionItemEditor</name>
     <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="107"/>
-      <source>Insert waypoint</source>
-      <translation type="unfinished">Insert waypoint</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="113"/>
-      <source>Insert pattern</source>
-      <translation type="unfinished">Insert pattern</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="130"/>
-      <source>Insert </source>
-      <translation type="unfinished">Insert </translation>
+      <location filename="../src/PlanView/MissionItemEditor.qml" line="102"/>
+      <source>?</source>
+      <extracomment>Indicator in Plan view to show mission item is not ready for save/send</extracomment>
+      <translation type="unfinished">?</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="136"/>
-      <source>Delete</source>
-      <translation type="unfinished">Delete</translation>
+      <location filename="../src/PlanView/MissionItemEditor.qml" line="206"/>
+      <source>Move to vehicle position</source>
+      <translation type="unfinished">Move to vehicle position</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="141"/>
-      <source>Change command...</source>
-      <translation type="unfinished">Change command...</translation>
+      <location filename="../src/PlanView/MissionItemEditor.qml" line="213"/>
+      <source>Move to previous item position</source>
+      <translation type="unfinished">Move to previous item position</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="147"/>
+      <location filename="../src/PlanView/MissionItemEditor.qml" line="219"/>
       <source>Edit position...</source>
       <translation type="unfinished">Edit position...</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="149"/>
+      <location filename="../src/PlanView/MissionItemEditor.qml" line="221"/>
       <source>Edit Position</source>
       <translation type="unfinished">Edit Position</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="157"/>
+      <location filename="../src/PlanView/MissionItemEditor.qml" line="229"/>
       <source>Show all values</source>
       <translation type="unfinished">Show all values</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="167"/>
+      <location filename="../src/PlanView/MissionItemEditor.qml" line="239"/>
       <source>Mission Edit</source>
       <translation type="unfinished">Mission Edit</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="167"/>
+      <location filename="../src/PlanView/MissionItemEditor.qml" line="239"/>
       <source>You have made changes to the mission item which cannot be shown in Simple Mode</source>
       <translation type="unfinished">You have made changes to the mission item which cannot be shown in Simple Mode</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="196"/>
+      <location filename="../src/PlanView/MissionItemEditor.qml" line="249"/>
+      <source>Item #%1</source>
+      <translation type="unfinished">Item #%1</translation>
+    </message>
+    <message>
+      <location filename="../src/PlanView/MissionItemEditor.qml" line="156"/>
       <source>Select Mission Command</source>
       <translation type="unfinished">Select Mission Command</translation>
     </message>
@@ -8807,7 +9678,7 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
   <context>
     <name>MissionItemStatus</name>
     <message>
-      <location filename="../src/PlanView/MissionItemStatus.qml" line="44"/>
+      <location filename="../src/PlanView/MissionItemStatus.qml" line="46"/>
       <source>Terrain Altitude</source>
       <translation type="unfinished">Terrain Altitude</translation>
     </message>
@@ -8848,68 +9719,58 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
       <translation type="unfinished">Above camera commands will take affect immediately upon mission start.</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="112"/>
-      <source>Mission End</source>
-      <translation type="unfinished">Mission End</translation>
+      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="180"/>
+      <source>Launch Position</source>
+      <translation type="unfinished">Launch Position</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="123"/>
-      <source>Return To Launch</source>
-      <translation type="unfinished">Return To Launch</translation>
+      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="216"/>
+      <source>Set To Map Center</source>
+      <translation type="unfinished">Set To Map Center</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="132"/>
+      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="114"/>
       <source>Vehicle Info</source>
       <translation type="unfinished">Vehicle Info</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="172"/>
+      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="154"/>
       <source>Cruise speed</source>
       <translation type="unfinished">Cruise speed</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="183"/>
+      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="165"/>
       <source>Hover speed</source>
       <translation type="unfinished">Hover speed</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="196"/>
-      <source>Planned Home Position</source>
-      <translation type="unfinished">Planned Home Position</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="215"/>
+      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="199"/>
       <source>Altitude</source>
       <translation type="unfinished">Altitude</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="227"/>
+      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="211"/>
       <source>Actual position set by vehicle at flight time.</source>
       <translation type="unfinished">Actual position set by vehicle at flight time.</translation>
     </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="232"/>
-      <source>Set Home To Map Center</source>
-      <translation type="unfinished">Set Home To Map Center</translation>
-    </message>
   </context>
   <context>
     <name>MissionSettingsItem</name>
     <message>
-      <location filename="../src/MissionManager/MissionSettingsItem.cc" line="304"/>
-      <source>H</source>
-      <translation type="unfinished">H</translation>
+      <location filename="../src/MissionManager/MissionSettingsItem.cc" line="294"/>
+      <source>L</source>
+      <translation type="unfinished">L</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/MissionSettingsItem.cc" line="304"/>
-      <source>Planned Home</source>
-      <translation type="unfinished">Planned Home</translation>
+      <location filename="../src/MissionManager/MissionSettingsItem.cc" line="294"/>
+      <source>Launch</source>
+      <translation type="unfinished">Launch</translation>
     </message>
   </context>
   <context>
     <name>MockConfiguration</name>
     <message>
-      <location filename="../src/comm/MockLink.h" line="73"/>
+      <location filename="../src/comm/MockLink.h" line="74"/>
       <source>Mock Link Settings</source>
       <translation type="unfinished">Mock Link Settings</translation>
     </message>
@@ -8917,42 +9778,42 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
   <context>
     <name>MockLink</name>
     <message>
-      <location filename="../src/ui/preferences/MockLink.qml" line="40"/>
+      <location filename="../src/ui/preferences/MockLink.qml" line="46"/>
       <source>PX4 Vehicle</source>
       <translation type="unfinished">PX4 Vehicle</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/MockLink.qml" line="44"/>
+      <location filename="../src/ui/preferences/MockLink.qml" line="51"/>
       <source>APM ArduCopter Vehicle</source>
       <translation type="unfinished">APM ArduCopter Vehicle</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/MockLink.qml" line="48"/>
+      <location filename="../src/ui/preferences/MockLink.qml" line="57"/>
       <source>APM ArduPlane Vehicle</source>
       <translation type="unfinished">APM ArduPlane Vehicle</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/MockLink.qml" line="52"/>
+      <location filename="../src/ui/preferences/MockLink.qml" line="63"/>
       <source>APM ArduSub Vehicle</source>
       <translation type="unfinished">APM ArduSub Vehicle</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/MockLink.qml" line="56"/>
+      <location filename="../src/ui/preferences/MockLink.qml" line="69"/>
       <source>APM ArduRover Vehicle</source>
       <translation type="unfinished">APM ArduRover Vehicle</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/MockLink.qml" line="60"/>
+      <location filename="../src/ui/preferences/MockLink.qml" line="75"/>
       <source>Generic Vehicle</source>
       <translation type="unfinished">Generic Vehicle</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/MockLink.qml" line="65"/>
+      <location filename="../src/ui/preferences/MockLink.qml" line="43"/>
       <source>Send status text + voice</source>
       <translation type="unfinished">Send status text + voice</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences/MockLink.qml" line="68"/>
+      <location filename="../src/ui/preferences/MockLink.qml" line="80"/>
       <source>Stop One MockLink</source>
       <translation type="unfinished">Stop One MockLink</translation>
     </message>
@@ -8995,15 +9856,6 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
       <translation type="unfinished">ArduPlane</translation>
     </message>
   </context>
-  <context>
-    <name>ModeIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/ModeIndicator.qml" line="33"/>
-      <source>N/A</source>
-      <comment>No data to display</comment>
-      <translation type="unfinished">N/A</translation>
-    </message>
-  </context>
   <context>
     <name>ModeSwitchDisplay</name>
     <message>
@@ -9016,41 +9868,121 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
       <source>Threshold:</source>
       <translation type="unfinished">Threshold:</translation>
     </message>
-  </context>
-  <context>
-    <name>MotorComponent</name>
+  </context>
+  <context>
+    <name>MotorComponent</name>
+    <message>
+      <location filename="../src/AutoPilotPlugins/Common/MotorComponent.qml" line="39"/>
+      <source>Warning: Unable to determine motor count</source>
+      <translation type="unfinished">Warning: Unable to determine motor count</translation>
+    </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/Common/MotorComponent.qml" line="96"/>
+      <source>All</source>
+      <translation type="unfinished">All</translation>
+    </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/Common/MotorComponent.qml" line="122"/>
+      <source>Moving the sliders will causes the motors to spin. Make sure you remove all props.</source>
+      <translation type="unfinished">Moving the sliders will causes the motors to spin. Make sure you remove all props.</translation>
+    </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/Common/MotorComponent.qml" line="142"/>
+      <source>Propellers are removed - Enable motor sliders</source>
+      <translation type="unfinished">Propellers are removed - Enable motor sliders</translation>
+    </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/Common/MotorComponent.qml" line="142"/>
+      <source>Careful: Motor sliders are enabled</source>
+      <translation type="unfinished">Careful: Motor sliders are enabled</translation>
+    </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/Common/MotorComponent.cc" line="14"/>
+      <source>Motors</source>
+      <translation type="unfinished">Motors</translation>
+    </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/Common/MotorComponent.cc" line="26"/>
+      <source>Motors Setup is used to manually test motor control and direction.</source>
+      <translation type="unfinished">Motors Setup is used to manually test motor control and direction.</translation>
+    </message>
+  </context>
+  <context>
+    <name>MultiRotorChecklist</name>
+    <message>
+      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="25"/>
+      <source>Multirotor Initial Checks</source>
+      <translation type="unfinished">Multirotor Initial Checks</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="28"/>
+      <source>Hardware</source>
+      <translation type="unfinished">Hardware</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="29"/>
+      <source>Props mounted and secured?</source>
+      <translation type="unfinished">Props mounted and secured?</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="50"/>
+      <source>Please arm the vehicle here</source>
+      <translation type="unfinished">Please arm the vehicle here</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="53"/>
+      <source>Motors</source>
+      <translation type="unfinished">Motors</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="54"/>
+      <source>Propellers free? Then throttle up gently. Working properly?</source>
+      <translation type="unfinished">Propellers free? Then throttle up gently. Working properly?</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="58"/>
+      <source>Mission</source>
+      <translation type="unfinished">Mission</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="59"/>
+      <source>Please confirm mission is valid (waypoints valid, no terrain collision).</source>
+      <translation type="unfinished">Please confirm mission is valid (waypoints valid, no terrain collision).</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="67"/>
+      <source>Last preparations before launch</source>
+      <translation type="unfinished">Last preparations before launch</translation>
+    </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/Common/MotorComponent.qml" line="81"/>
-      <source>All</source>
-      <translation type="unfinished">All</translation>
+      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="71"/>
+      <source>Payload</source>
+      <translation type="unfinished">Payload</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/Common/MotorComponent.qml" line="114"/>
-      <source>Moving the sliders will causes the motors to spin. Make sure you remove all props.</source>
-      <translation type="unfinished">Moving the sliders will causes the motors to spin. Make sure you remove all props.</translation>
+      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="72"/>
+      <source>Configured and started? Payload lid closed?</source>
+      <translation type="unfinished">Configured and started? Payload lid closed?</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/Common/MotorComponent.qml" line="134"/>
-      <source>Propellers are removed - Enable motor sliders</source>
-      <translation type="unfinished">Propellers are removed - Enable motor sliders</translation>
+      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="76"/>
+      <source>Wind &amp; weather</source>
+      <translation type="unfinished">Wind &amp; weather</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/Common/MotorComponent.cc" line="14"/>
-      <source>Motors</source>
-      <translation type="unfinished">Motors</translation>
+      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="77"/>
+      <source>OK for your platform?</source>
+      <translation type="unfinished">OK for your platform?</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/Common/MotorComponent.cc" line="26"/>
-      <source>Motors Setup is used to manually test motor control and direction.</source>
-      <translation type="unfinished">Motors Setup is used to manually test motor control and direction.</translation>
+      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="81"/>
+      <source>Flight area</source>
+      <translation type="unfinished">Flight area</translation>
     </message>
-  </context>
-  <context>
-    <name>MultiVehicleDockWidget</name>
     <message>
-      <location filename="../src/ui/MultiVehicleDockWidget.ui" line="14"/>
-      <source>Form</source>
-      <translation type="unfinished">Form</translation>
+      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="82"/>
+      <source>Launch area and path free of obstacles/people?</source>
+      <translation type="unfinished">Launch area and path free of obstacles/people?</translation>
     </message>
   </context>
   <context>
@@ -9074,60 +10006,81 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
   <context>
     <name>MultiVehicleManager</name>
     <message>
-      <location filename="../src/Vehicle/MultiVehicleManager.cc" line="126"/>
+      <location filename="../src/Vehicle/MultiVehicleManager.cc" line="125"/>
       <source>Warning: A vehicle is using the same system id as %1: %2</source>
       <translation type="unfinished">Warning: A vehicle is using the same system id as %1: %2</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/MultiVehicleManager.cc" line="144"/>
+      <location filename="../src/Vehicle/MultiVehicleManager.cc" line="143"/>
       <source>Connected to Vehicle %1</source>
       <translation type="unfinished">Connected to Vehicle %1</translation>
     </message>
   </context>
+  <context>
+    <name>MultiVehiclePanel</name>
+    <message>
+      <location filename="../src/FlightDisplay/MultiVehiclePanel.qml" line="38"/>
+      <source>Single</source>
+      <translation type="unfinished">Single</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/MultiVehiclePanel.qml" line="44"/>
+      <source>Multi-Vehicle</source>
+      <translation type="unfinished">Multi-Vehicle</translation>
+    </message>
+  </context>
+  <context>
+    <name>MultiVehicleSelector</name>
+    <message>
+      <location filename="../src/ui/toolbar/MultiVehicleSelector.qml" line="48"/>
+      <source>Vehicle</source>
+      <translation type="unfinished">Vehicle</translation>
+    </message>
+  </context>
   <context>
     <name>OfflineMap</name>
     <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="240"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="238"/>
       <source>Error Message</source>
       <translation type="unfinished">Error Message</translation>
     </message>
     <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="270"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="268"/>
       <source>Max Cache Disk Size (MB):</source>
       <translation type="unfinished">Max Cache Disk Size (MB):</translation>
     </message>
     <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="286"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="284"/>
       <source>Max Cache Memory Size (MB):</source>
       <translation type="unfinished">Max Cache Memory Size (MB):</translation>
     </message>
     <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="302"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="300"/>
       <source>Memory cache changes require a restart to take effect.</source>
       <translation type="unfinished">Memory cache changes require a restart to take effect.</translation>
     </message>
     <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="306"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="304"/>
       <source>Mapbox Access Token</source>
       <translation type="unfinished">Mapbox Access Token</translation>
     </message>
     <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="317"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="315"/>
       <source>To enable Mapbox maps, enter your access token.</source>
       <translation type="unfinished">To enable Mapbox maps, enter your access token.</translation>
     </message>
     <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="323"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="321"/>
       <source>Esri Access Token</source>
       <translation type="unfinished">Esri Access Token</translation>
     </message>
     <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="334"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="332"/>
       <source>To enable Esri maps, enter your access token.</source>
       <translation type="unfinished">To enable Esri maps, enter your access token.</translation>
     </message>
     <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="349"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="347"/>
       <source>This will delete all tiles INCLUDING the tile sets you have created yourself.
 
 Is this really what you want?</source>
@@ -9136,7 +10089,7 @@ Is this really what you want?</source>
 Is this really what you want?</translation>
     </message>
     <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="351"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="349"/>
       <source>Delete %1 and all its tiles.
 
 Is this really what you want?</source>
@@ -9145,83 +10098,83 @@ Is this really what you want?</source>
 Is this really what you want?</translation>
     </message>
     <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="455"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="454"/>
       <source>System Wide Tile Cache</source>
       <translation type="unfinished">System Wide Tile Cache</translation>
     </message>
     <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="468"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="467"/>
       <source>Zoom Levels:</source>
       <translation type="unfinished">Zoom Levels:</translation>
     </message>
     <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="475"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="474"/>
       <source>Total:</source>
       <translation type="unfinished">Total:</translation>
     </message>
     <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="482"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="481"/>
       <source>Unique:</source>
       <translation type="unfinished">Unique:</translation>
     </message>
     <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="490"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="489"/>
       <source>Downloaded:</source>
       <translation type="unfinished">Downloaded:</translation>
     </message>
     <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="497"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="496"/>
       <source>Error Count:</source>
       <translation type="unfinished">Error Count:</translation>
     </message>
     <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="505"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="504"/>
       <source>Size:</source>
       <translation type="unfinished">Size:</translation>
     </message>
     <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="512"/>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="885"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="511"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="886"/>
       <source>Tile Count:</source>
       <translation type="unfinished">Tile Count:</translation>
     </message>
     <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="519"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="518"/>
       <source>Resume Download</source>
       <translation type="unfinished">Resume Download</translation>
     </message>
     <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="528"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="527"/>
       <source>Cancel Download</source>
       <translation type="unfinished">Cancel Download</translation>
     </message>
     <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="537"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="536"/>
       <source>Delete</source>
       <translation type="unfinished">Delete</translation>
     </message>
     <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="539"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="538"/>
       <source>Confirm Delete</source>
       <translation type="unfinished">Confirm Delete</translation>
     </message>
     <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="542"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="541"/>
       <source>Ok</source>
       <translation type="unfinished">Ok</translation>
     </message>
     <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="555"/>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1137"/>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1217"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="554"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1138"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1218"/>
       <source>Close</source>
       <translation type="unfinished">Close</translation>
     </message>
     <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="555"/>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="930"/>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1087"/>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1241"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="554"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="931"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1088"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1242"/>
       <source>Cancel</source>
       <translation type="unfinished">Cancel</translation>
     </message>
@@ -9231,134 +10184,167 @@ Is this really what you want?</translation>
       <translation type="unfinished">Min Zoom: %1</translation>
     </message>
     <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="654"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="655"/>
       <source>Max Zoom: %1</source>
       <translation type="unfinished">Max Zoom: %1</translation>
     </message>
     <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="700"/>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="962"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="701"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="963"/>
       <source>Add New Set</source>
       <translation type="unfinished">Add New Set</translation>
     </message>
     <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="728"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="729"/>
       <source>Name:</source>
       <translation type="unfinished">Name:</translation>
     </message>
     <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="741"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="742"/>
       <source>Map type:</source>
       <translation type="unfinished">Map type:</translation>
     </message>
     <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="764"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="765"/>
       <source>Fetch elevation data</source>
       <translation type="unfinished">Fetch elevation data</translation>
     </message>
     <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="790"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="791"/>
       <source>Min/Max Zoom Levels</source>
       <translation type="unfinished">Min/Max Zoom Levels</translation>
     </message>
     <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="894"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="895"/>
       <source>Est Size:</source>
       <translation type="unfinished">Est Size:</translation>
     </message>
     <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="906"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="907"/>
       <source>Too many tiles</source>
       <translation type="unfinished">Too many tiles</translation>
     </message>
     <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="917"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="918"/>
       <source>Download</source>
       <translation type="unfinished">Download</translation>
     </message>
     <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1000"/>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1231"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1001"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1232"/>
       <source>Import</source>
       <translation type="unfinished">Import</translation>
     </message>
     <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1009"/>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1077"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1010"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1078"/>
       <source>Export</source>
       <translation type="unfinished">Export</translation>
     </message>
     <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1015"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1016"/>
       <source>Options</source>
       <translation type="unfinished">Options</translation>
     </message>
     <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1017"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1018"/>
       <source>Offline Maps Options</source>
       <translation type="unfinished">Offline Maps Options</translation>
     </message>
     <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1038"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1039"/>
       <source>Select Tile Sets to Export</source>
       <translation type="unfinished">Select Tile Sets to Export</translation>
     </message>
     <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1067"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1068"/>
       <source>Select All</source>
       <translation type="unfinished">Select All</translation>
     </message>
     <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1072"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1073"/>
       <source>Select None</source>
       <translation type="unfinished">Select None</translation>
     </message>
     <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1081"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1082"/>
       <source>Export Tile Set</source>
       <translation type="unfinished">Export Tile Set</translation>
     </message>
     <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1116"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1117"/>
       <source>Tile Set Export Progress</source>
       <translation type="unfinished">Tile Set Export Progress</translation>
     </message>
     <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1116"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1117"/>
       <source>Tile Set Export Completed</source>
       <translation type="unfinished">Tile Set Export Completed</translation>
     </message>
     <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1172"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1173"/>
       <source>Map Tile Set Import</source>
       <translation type="unfinished">Map Tile Set Import</translation>
     </message>
     <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1174"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1175"/>
       <source>Map Tile Set Import Progress</source>
       <translation type="unfinished">Map Tile Set Import Progress</translation>
     </message>
     <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1176"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1177"/>
       <source>Map Tile Set Import Completed</source>
       <translation type="unfinished">Map Tile Set Import Completed</translation>
     </message>
     <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1204"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1205"/>
       <source>Append to existing set</source>
       <translation type="unfinished">Append to existing set</translation>
     </message>
     <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1210"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1211"/>
       <source>Replace existing set</source>
       <translation type="unfinished">Replace existing set</translation>
     </message>
     <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1235"/>
+      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1236"/>
       <source>Import Tile Set</source>
       <translation type="unfinished">Import Tile Set</translation>
     </message>
   </context>
+  <context>
+    <name>OfflineVehicleFirstRunPrompt</name>
+    <message>
+      <location filename="../src/FirstRunPromptDialogs/OfflineVehicleFirstRunPrompt.qml" line="21"/>
+      <source>Vehicle Information</source>
+      <translation type="unfinished">Vehicle Information</translation>
+    </message>
+    <message>
+      <location filename="../src/FirstRunPromptDialogs/OfflineVehicleFirstRunPrompt.qml" line="39"/>
+      <source>Specify information about the vehicle you plan to fly. If you are unsure of the correct values leave them as is.</source>
+      <translation type="unfinished">Specify information about the vehicle you plan to fly. If you are unsure of the correct values leave them as is.</translation>
+    </message>
+    <message>
+      <location filename="../src/FirstRunPromptDialogs/OfflineVehicleFirstRunPrompt.qml" line="59"/>
+      <source>Firmware</source>
+      <translation type="unfinished">Firmware</translation>
+    </message>
+    <message>
+      <location filename="../src/FirstRunPromptDialogs/OfflineVehicleFirstRunPrompt.qml" line="71"/>
+      <source>Vehicle</source>
+      <translation type="unfinished">Vehicle</translation>
+    </message>
+    <message>
+      <location filename="../src/FirstRunPromptDialogs/OfflineVehicleFirstRunPrompt.qml" line="83"/>
+      <source>Mission Cruise Speed</source>
+      <translation type="unfinished">Mission Cruise Speed</translation>
+    </message>
+    <message>
+      <location filename="../src/FirstRunPromptDialogs/OfflineVehicleFirstRunPrompt.qml" line="94"/>
+      <source>Mission Hover Speed</source>
+      <translation type="unfinished">Mission Hover Speed</translation>
+    </message>
+  </context>
   <context>
     <name>PIDTuning</name>
     <message>
@@ -9377,57 +10363,57 @@ Is this really what you want?</translation>
       <translation type="unfinished">Increment/Decrement %</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="318"/>
+      <location filename="../src/QmlControls/PIDTuning.qml" line="319"/>
       <source>Clipboard Values:</source>
       <translation type="unfinished">Clipboard Values:</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="344"/>
+      <location filename="../src/QmlControls/PIDTuning.qml" line="345"/>
       <source>Save To Clipboard</source>
       <translation type="unfinished">Save To Clipboard</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="349"/>
+      <location filename="../src/QmlControls/PIDTuning.qml" line="350"/>
       <source>Restore From Clipboard</source>
       <translation type="unfinished">Restore From Clipboard</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="356"/>
+      <location filename="../src/QmlControls/PIDTuning.qml" line="357"/>
       <source>Chart:</source>
       <translation type="unfinished">Chart:</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="362"/>
+      <location filename="../src/QmlControls/PIDTuning.qml" line="363"/>
       <source>Clear</source>
       <translation type="unfinished">Clear</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="367"/>
+      <location filename="../src/QmlControls/PIDTuning.qml" line="368"/>
       <source>Stop</source>
       <translation type="unfinished">Stop</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="367"/>
+      <location filename="../src/QmlControls/PIDTuning.qml" line="368"/>
       <source>Start</source>
       <translation type="unfinished">Start</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="379"/>
+      <location filename="../src/QmlControls/PIDTuning.qml" line="380"/>
       <source>Automatic Flight Mode Switching</source>
       <translation type="unfinished">Automatic Flight Mode Switching</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="385"/>
+      <location filename="../src/QmlControls/PIDTuning.qml" line="386"/>
       <source>Switches to &apos;Stabilized&apos; when you click Start.</source>
       <translation type="unfinished">Switches to &apos;Stabilized&apos; when you click Start.</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="390"/>
+      <location filename="../src/QmlControls/PIDTuning.qml" line="391"/>
       <source>Switches to &apos;%1&apos; when you click Stop.</source>
       <translation type="unfinished">Switches to &apos;%1&apos; when you click Stop.</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="426"/>
+      <location filename="../src/QmlControls/PIDTuning.qml" line="427"/>
       <source> Rate</source>
       <translation type="unfinished"> Rate</translation>
     </message>
@@ -9673,8 +10659,8 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="83"/>
       <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="83"/>
-      <source>The vehicle returns to the home position, loiters and then lands. </source>
-      <translation type="unfinished">The vehicle returns to the home position, loiters and then lands. </translation>
+      <source>The vehicle returns to the launch position, loiters and then lands. </source>
+      <translation type="unfinished">The vehicle returns to the launch position, loiters and then lands. </translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="85"/>
@@ -9710,21 +10696,21 @@ Is this really what you want?</translation>
   <context>
     <name>PX4AdvancedFlightModesController</name>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModesController.cc" line="155"/>
+      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModesController.cc" line="151"/>
       <source>%1 is set to %2. Mapping must between 0 and %3 (inclusive).
 </source>
       <translation type="unfinished">%1 is set to %2. Mapping must between 0 and %3 (inclusive).
 </translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModesController.cc" line="171"/>
+      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModesController.cc" line="167"/>
       <source>%1 is set to same channel as %2.
 </source>
       <translation type="unfinished">%1 is set to same channel as %2.
 </translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModesController.cc" line="186"/>
+      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModesController.cc" line="177"/>
       <source>%1 is set to %2. Threshold must between 0.0 and 1.0 (inclusive).
 </source>
       <translation type="unfinished">%1 is set to %2. Threshold must between 0.0 and 1.0 (inclusive).
@@ -9734,7 +10720,7 @@ Is this really what you want?</translation>
   <context>
     <name>PX4AutoPilotPlugin</name>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AutoPilotPlugin.cc" line="140"/>
+      <location filename="../src/AutoPilotPlugins/PX4/PX4AutoPilotPlugin.cc" line="135"/>
       <source>Warning: Hardware In The Loop (HITL) simulation is enabled for this vehicle.</source>
       <translation type="unfinished">Warning: Hardware In The Loop (HITL) simulation is enabled for this vehicle.</translation>
     </message>
@@ -9742,132 +10728,132 @@ Is this really what you want?</translation>
   <context>
     <name>PX4FirmwarePlugin</name>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="39"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="41"/>
       <source>Manual</source>
       <translation type="unfinished">Manual</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="40"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="42"/>
       <source>Acro</source>
       <translation type="unfinished">Acro</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="41"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="43"/>
       <source>Stabilized</source>
       <translation type="unfinished">Stabilized</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="42"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="44"/>
       <source>Rattitude</source>
       <translation type="unfinished">Rattitude</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="43"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="45"/>
       <source>Altitude</source>
       <translation type="unfinished">Altitude</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="44"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="46"/>
       <source>Position</source>
       <translation type="unfinished">Position</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="45"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="47"/>
       <source>Offboard</source>
       <translation type="unfinished">Offboard</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="46"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="48"/>
       <source>Ready</source>
       <translation type="unfinished">Ready</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="47"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="49"/>
       <source>Takeoff</source>
       <translation type="unfinished">Takeoff</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="48"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="50"/>
       <source>Hold</source>
       <translation type="unfinished">Hold</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="49"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="51"/>
       <source>Mission</source>
       <translation type="unfinished">Mission</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="50"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="52"/>
       <source>Return</source>
       <translation type="unfinished">Return</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="51"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="53"/>
       <source>Land</source>
       <translation type="unfinished">Land</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="52"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="54"/>
       <source>Precision Land</source>
       <translation type="unfinished">Precision Land</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="53"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="55"/>
       <source>Return to Groundstation</source>
       <translation type="unfinished">Return to Groundstation</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="54"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="56"/>
       <source>Follow Me</source>
       <translation type="unfinished">Follow Me</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="55"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="57"/>
       <source>Simple</source>
       <translation type="unfinished">Simple</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="56"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="58"/>
       <source>Orbit</source>
       <translation type="unfinished">Orbit</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="190"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="192"/>
       <source>Unknown %1:%2</source>
       <translation type="unfinished">Unknown %1:%2</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="403"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="404"/>
       <source>Unable to takeoff, vehicle position not known.</source>
       <translation type="unfinished">Unable to takeoff, vehicle position not known.</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="425"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="427"/>
       <source>Unable to go to location, vehicle position not known.</source>
       <translation type="unfinished">Unable to go to location, vehicle position not known.</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="458"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="460"/>
       <source>Unable to change altitude, home position unknown.</source>
       <translation type="unfinished">Unable to change altitude, home position unknown.</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="462"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="464"/>
       <source>Unable to change altitude, home position altitude unknown.</source>
       <translation type="unfinished">Unable to change altitude, home position altitude unknown.</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="486"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="487"/>
       <source>Unable to start mission: Vehicle rejected arming.</source>
       <translation type="unfinished">Unable to start mission: Vehicle rejected arming.</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="490"/>
-      <source>Unable to start mission: Vehicle not ready.</source>
-      <translation type="unfinished">Unable to start mission: Vehicle not ready.</translation>
+      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="491"/>
+      <source>Unable to start mission: Vehicle not changing to %1 flight mode.</source>
+      <translation type="unfinished">Unable to start mission: Vehicle not changing to %1 flight mode.</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="562"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="563"/>
       <source>QGroundControl supports PX4 Pro firmware Version %1.%2.%3 and above. You are using a version prior to that which will lead to unpredictable results. Please upgrade your firmware.</source>
       <translation type="unfinished">QGroundControl supports PX4 Pro firmware Version %1.%2.%3 and above. You are using a version prior to that which will lead to unpredictable results. Please upgrade your firmware.</translation>
     </message>
@@ -9942,12 +10928,12 @@ Is this really what you want?</translation>
   <context>
     <name>PX4ParameterMetaData</name>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="343"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="341"/>
       <source>Enabled</source>
       <translation type="unfinished">Enabled</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="345"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="343"/>
       <source>Disabled</source>
       <translation type="unfinished">Disabled</translation>
     </message>
@@ -10041,20 +11027,20 @@ Is this really what you want?</translation>
       <translation type="unfinished">Flight Mode Settings</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="97"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="97"/>
-      <source>Mode channel:</source>
-      <translation type="unfinished">Mode channel:</translation>
+      <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="96"/>
+      <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="96"/>
+      <source>Mode Channel</source>
+      <translation type="unfinished">Mode Channel</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="118"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="118"/>
+      <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="104"/>
+      <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="104"/>
       <source>Flight Mode %1</source>
       <translation type="unfinished">Flight Mode %1</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="138"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="138"/>
+      <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="135"/>
+      <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="135"/>
       <source>Switch Settings</source>
       <translation type="unfinished">Switch Settings</translation>
     </message>
@@ -10075,44 +11061,44 @@ Is this really what you want?</translation>
   <context>
     <name>PX4TuningComponentCopter</name>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml" line="46"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml" line="46"/>
+      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml" line="47"/>
+      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml" line="47"/>
       <source>Hover Throttle</source>
       <translation type="unfinished">Hover Throttle</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml" line="47"/>
+      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml" line="48"/>
+      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml" line="48"/>
       <source>Adjust throttle so hover is at mid-throttle. Slide to the left if hover is lower than throttle center. Slide to the right if hover is higher than throttle center.</source>
       <translation type="unfinished">Adjust throttle so hover is at mid-throttle. Slide to the left if hover is lower than throttle center. Slide to the right if hover is higher than throttle center.</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml" line="55"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml" line="55"/>
+      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml" line="56"/>
+      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml" line="56"/>
       <source>Manual minimum throttle</source>
       <translation type="unfinished">Manual minimum throttle</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml" line="56"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml" line="56"/>
+      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml" line="57"/>
+      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml" line="57"/>
       <source>Slide to the left to start the motors with less idle power. Slide to the right if descending in manual flight becomes unstable.</source>
       <translation type="unfinished">Slide to the left to start the motors with less idle power. Slide to the right if descending in manual flight becomes unstable.</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml" line="77"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml" line="77"/>
+      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml" line="78"/>
+      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml" line="78"/>
       <source>Roll</source>
       <translation type="unfinished">Roll</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml" line="77"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml" line="77"/>
+      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml" line="78"/>
+      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml" line="78"/>
       <source>Pitch</source>
       <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml" line="77"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml" line="77"/>
+      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml" line="78"/>
+      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml" line="78"/>
       <source>Yaw</source>
       <translation type="unfinished">Yaw</translation>
     </message>
@@ -10120,32 +11106,32 @@ Is this really what you want?</translation>
   <context>
     <name>PX4TuningComponentPlane</name>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml" line="45"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml" line="45"/>
+      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml" line="46"/>
+      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml" line="46"/>
       <source>Cruise throttle</source>
       <translation type="unfinished">Cruise throttle</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml" line="46"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml" line="46"/>
+      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml" line="47"/>
+      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml" line="47"/>
       <source>This is the throttle setting required to achieve the desired cruise speed. Most planes need 50-60%.</source>
       <translation type="unfinished">This is the throttle setting required to achieve the desired cruise speed. Most planes need 50-60%.</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml" line="67"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml" line="67"/>
+      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml" line="68"/>
+      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml" line="68"/>
       <source>Roll</source>
       <translation type="unfinished">Roll</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml" line="67"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml" line="67"/>
+      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml" line="68"/>
+      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml" line="68"/>
       <source>Pitch</source>
       <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml" line="67"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml" line="67"/>
+      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml" line="68"/>
+      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml" line="68"/>
       <source>Yaw</source>
       <translation type="unfinished">Yaw</translation>
     </message>
@@ -10225,6 +11211,85 @@ Is this really what you want?</translation>
       <translation type="unfinished">Slide to the left to make position control more accurate and more aggressive. Slide to the right to make flight in mission mode smoother and less twitchy.</translation>
     </message>
   </context>
+  <context>
+    <name>PairingManager</name>
+    <message>
+      <location filename="../src/PairingManager/PairingManager.cc" line="80"/>
+      <source>Pairing Successfull</source>
+      <translation type="unfinished">Pairing Successfull</translation>
+    </message>
+    <message>
+      <location filename="../src/PairingManager/PairingManager.cc" line="90"/>
+      <source>Connection Successfull</source>
+      <translation type="unfinished">Connection Successfull</translation>
+    </message>
+    <message>
+      <location filename="../src/PairingManager/PairingManager.cc" line="151"/>
+      <source>Connection Rejected</source>
+      <translation type="unfinished">Connection Rejected</translation>
+    </message>
+    <message>
+      <location filename="../src/PairingManager/PairingManager.cc" line="154"/>
+      <source>Pairing Rejected</source>
+      <translation type="unfinished">Pairing Rejected</translation>
+    </message>
+    <message>
+      <location filename="../src/PairingManager/PairingManager.cc" line="162"/>
+      <source>No Response From Vehicle</source>
+      <translation type="unfinished">No Response From Vehicle</translation>
+    </message>
+    <message>
+      <location filename="../src/PairingManager/PairingManager.cc" line="191"/>
+      <source>Connecting to %1</source>
+      <translation type="unfinished">Connecting to %1</translation>
+    </message>
+    <message>
+      <location filename="../src/PairingManager/PairingManager.cc" line="252"/>
+      <source>Invalid Pairing File</source>
+      <translation type="unfinished">Invalid Pairing File</translation>
+    </message>
+    <message>
+      <location filename="../src/PairingManager/PairingManager.cc" line="257"/>
+      <location filename="../src/PairingManager/PairingManager.cc" line="265"/>
+      <location filename="../src/PairingManager/PairingManager.cc" line="278"/>
+      <source>Error Parsing Pairing File</source>
+      <translation type="unfinished">Error Parsing Pairing File</translation>
+    </message>
+    <message>
+      <location filename="../src/PairingManager/PairingManager.cc" line="461"/>
+      <source>NFC</source>
+      <translation type="unfinished">NFC</translation>
+    </message>
+    <message>
+      <location filename="../src/PairingManager/PairingManager.cc" line="465"/>
+      <source>Microhard</source>
+      <translation type="unfinished">Microhard</translation>
+    </message>
+    <message>
+      <location filename="../src/PairingManager/PairingManager.cc" line="495"/>
+      <location filename="../src/PairingManager/PairingManager.cc" line="517"/>
+      <source>Pairing...</source>
+      <translation type="unfinished">Pairing...</translation>
+    </message>
+  </context>
+  <context>
+    <name>PairingNFC</name>
+    <message>
+      <location filename="../src/PairingManager/QtNFC.cc" line="30"/>
+      <source>Waiting for NFC connection</source>
+      <translation type="unfinished">Waiting for NFC connection</translation>
+    </message>
+    <message>
+      <location filename="../src/PairingManager/QtNFC.cc" line="78"/>
+      <source>Device detected</source>
+      <translation type="unfinished">Device detected</translation>
+    </message>
+    <message>
+      <location filename="../src/PairingManager/QtNFC.cc" line="114"/>
+      <source>Device removed</source>
+      <translation type="unfinished">Device removed</translation>
+    </message>
+  </context>
   <context>
     <name>ParameterEditor</name>
     <message>
@@ -10233,74 +11298,83 @@ Is this really what you want?</translation>
       <translation type="unfinished">Parameter Load Errors</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="64"/>
+      <location filename="../src/QmlControls/ParameterEditor.qml" line="63"/>
       <source>Search:</source>
       <translation type="unfinished">Search:</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="75"/>
+      <location filename="../src/QmlControls/ParameterEditor.qml" line="74"/>
       <source>Clear</source>
       <translation type="unfinished">Clear</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="86"/>
+      <location filename="../src/QmlControls/ParameterEditor.qml" line="85"/>
       <source>Show modified only</source>
       <translation type="unfinished">Show modified only</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="99"/>
+      <location filename="../src/QmlControls/ParameterEditor.qml" line="98"/>
       <source>Tools</source>
       <translation type="unfinished">Tools</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="107"/>
+      <location filename="../src/QmlControls/ParameterEditor.qml" line="106"/>
       <source>Refresh</source>
       <translation type="unfinished">Refresh</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="111"/>
+      <location filename="../src/QmlControls/ParameterEditor.qml" line="110"/>
       <source>Reset all to firmware&apos;s defaults</source>
       <translation type="unfinished">Reset all to firmware&apos;s defaults</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="113"/>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="118"/>
+      <location filename="../src/QmlControls/ParameterEditor.qml" line="111"/>
+      <location filename="../src/QmlControls/ParameterEditor.qml" line="116"/>
       <source>Reset All</source>
       <translation type="unfinished">Reset All</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="116"/>
+      <location filename="../src/QmlControls/ParameterEditor.qml" line="114"/>
       <source>Reset to vehicle&apos;s configuration defaults</source>
       <translation type="unfinished">Reset to vehicle&apos;s configuration defaults</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="122"/>
+      <location filename="../src/QmlControls/ParameterEditor.qml" line="120"/>
       <source>Load from file...</source>
       <translation type="unfinished">Load from file...</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="124"/>
+      <location filename="../src/QmlControls/ParameterEditor.qml" line="122"/>
       <source>Load Parameters</source>
       <translation type="unfinished">Load Parameters</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="130"/>
+      <location filename="../src/QmlControls/ParameterEditor.qml" line="128"/>
       <source>Save to file...</source>
       <translation type="unfinished">Save to file...</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="132"/>
+      <location filename="../src/QmlControls/ParameterEditor.qml" line="130"/>
       <source>Save Parameters</source>
       <translation type="unfinished">Save Parameters</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="139"/>
-      <source>Clear RC to Param</source>
-      <translation type="unfinished">Clear RC to Param</translation>
+      <location filename="../src/QmlControls/ParameterEditor.qml" line="137"/>
+      <source>Clear all RC to Param</source>
+      <translation type="unfinished">Clear all RC to Param</translation>
+    </message>
+    <message>
+      <location filename="../src/QmlControls/ParameterEditor.qml" line="325"/>
+      <source>Select Reset to reset all parameters to their defaults.
+
+Note that this will also completely reset everything, including UAVCAN nodes.</source>
+      <translation type="unfinished">Select Reset to reset all parameters to their defaults.
+
+Note that this will also completely reset everything, including UAVCAN nodes.</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="145"/>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="146"/>
+      <location filename="../src/QmlControls/ParameterEditor.qml" line="143"/>
+      <location filename="../src/QmlControls/ParameterEditor.qml" line="144"/>
       <source>Reboot Vehicle</source>
       <translation type="unfinished">Reboot Vehicle</translation>
     </message>
@@ -10319,11 +11393,6 @@ Is this really what you want?</translation>
       <source>All Files (*.*)</source>
       <translation type="unfinished">All Files (*.*)</translation>
     </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="325"/>
-      <source>Select Reset to reset all parameters to their defaults.</source>
-      <translation type="unfinished">Select Reset to reset all parameters to their defaults.</translation>
-    </message>
     <message>
       <location filename="../src/QmlControls/ParameterEditor.qml" line="340"/>
       <source>Select Reset to reset all parameters to the vehicle&apos;s configuration defaults.</source>
@@ -10338,22 +11407,12 @@ Is this really what you want?</translation>
   <context>
     <name>ParameterEditorController</name>
     <message>
-      <location filename="../src/QmlControls/ParameterEditorController.cc" line="26"/>
-      <source>Component </source>
-      <translation type="unfinished">Component </translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorController.cc" line="63"/>
-      <source>All</source>
-      <translation type="unfinished">All</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorController.cc" line="111"/>
+      <location filename="../src/QmlControls/ParameterEditorController.cc" line="100"/>
       <source>Unable to create file: %1</source>
       <translation type="unfinished">Unable to create file: %1</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/ParameterEditorController.cc" line="129"/>
+      <location filename="../src/QmlControls/ParameterEditorController.cc" line="118"/>
       <source>Unable to open file: %1</source>
       <translation type="unfinished">Unable to open file: %1</translation>
     </message>
@@ -10361,90 +11420,117 @@ Is this really what you want?</translation>
   <context>
     <name>ParameterEditorDialog</name>
     <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="134"/>
+      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="135"/>
       <source>Reset to default</source>
       <translation type="unfinished">Reset to default</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="208"/>
+      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="209"/>
       <source>Min: </source>
       <translation type="unfinished">Min: </translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="213"/>
+      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="214"/>
       <source>Max: </source>
       <translation type="unfinished">Max: </translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="218"/>
+      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="219"/>
       <source>Default: </source>
       <translation type="unfinished">Default: </translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="224"/>
+      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="225"/>
       <source>Parameter name: </source>
       <translation type="unfinished">Parameter name: </translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="241"/>
+      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="242"/>
       <source>Warning: Modifying values while vehicle is in flight can lead to vehicle instability and possible vehicle loss. </source>
       <translation type="unfinished">Warning: Modifying values while vehicle is in flight can lead to vehicle instability and possible vehicle loss. </translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="242"/>
+      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="243"/>
       <source>Make sure you know what you are doing and double-check your values before Save!</source>
       <translation type="unfinished">Make sure you know what you are doing and double-check your values before Save!</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="249"/>
+      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="250"/>
       <source>Force save (dangerous!)</source>
       <translation type="unfinished">Force save (dangerous!)</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="266"/>
+      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="267"/>
       <source>Advanced settings</source>
       <translation type="unfinished">Advanced settings</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="281"/>
+      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="282"/>
       <source>Manual Entry</source>
       <translation type="unfinished">Manual Entry</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="289"/>
-      <source>Set RC to Param...</source>
-      <translation type="unfinished">Set RC to Param...</translation>
+      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="290"/>
+      <source>Set RC to Param</source>
+      <translation type="unfinished">Set RC to Param</translation>
     </message>
   </context>
   <context>
     <name>ParameterManager</name>
     <message>
-      <location filename="../src/FactSystem/ParameterManager.cc" line="643"/>
+      <location filename="../src/FactSystem/ParameterManager.cc" line="644"/>
+      <source>Misc</source>
+      <translation type="unfinished">Misc</translation>
+    </message>
+    <message>
+      <location filename="../src/FactSystem/ParameterManager.cc" line="670"/>
+      <source>Component %1  (%2)</source>
+      <translation type="unfinished">Component %1  (%2)</translation>
+    </message>
+    <message>
+      <location filename="../src/FactSystem/ParameterManager.cc" line="672"/>
+      <source>Component </source>
+      <translation type="unfinished">Component </translation>
+    </message>
+    <message>
+      <location filename="../src/FactSystem/ParameterManager.cc" line="783"/>
       <source>Parameter write failed: veh:%1 comp:%2 param:%3</source>
       <translation type="unfinished">Parameter write failed: veh:%1 comp:%2 param:%3</translation>
     </message>
     <message>
-      <location filename="../src/FactSystem/ParameterManager.cc" line="665"/>
+      <location filename="../src/FactSystem/ParameterManager.cc" line="805"/>
       <source>Parameter read failed: veh:%1 comp:%2 param:%3</source>
       <translation type="unfinished">Parameter read failed: veh:%1 comp:%2 param:%3</translation>
     </message>
     <message>
-      <location filename="../src/FactSystem/ParameterManager.cc" line="892"/>
+      <location filename="../src/FactSystem/ParameterManager.cc" line="1032"/>
       <source>Parameter cache CRC match failed</source>
       <translation type="unfinished">Parameter cache CRC match failed</translation>
     </message>
     <message>
-      <location filename="../src/FactSystem/ParameterManager.cc" line="1143"/>
+      <location filename="../src/FactSystem/ParameterManager.cc" line="1083"/>
+      <source>Parameters not loaded since they are not currently on the vehicle: %1
+</source>
+      <translation type="unfinished">Parameters not loaded since they are not currently on the vehicle: %1
+</translation>
+    </message>
+    <message>
+      <location filename="../src/FactSystem/ParameterManager.cc" line="1087"/>
+      <source>Parameters not loaded due to type mismatch: %1</source>
+      <translation type="unfinished">Parameters not loaded due to type mismatch: %1</translation>
+    </message>
+    <message>
+      <location filename="../src/FactSystem/ParameterManager.cc" line="1294"/>
       <source>%1 was unable to retrieve the full set of parameters from vehicle %2. This will cause %1 to be unable to display its full user interface. If you are using modified firmware, you may need to resolve any vehicle startup errors to resolve the issue. If you are using standard firmware, you may need to upgrade to a newer version to resolve the issue.</source>
       <translation type="unfinished">%1 was unable to retrieve the full set of parameters from vehicle %2. This will cause %1 to be unable to display its full user interface. If you are using modified firmware, you may need to resolve any vehicle startup errors to resolve the issue. If you are using standard firmware, you may need to upgrade to a newer version to resolve the issue.</translation>
     </message>
     <message>
-      <location filename="../src/FactSystem/ParameterManager.cc" line="1169"/>
+      <location filename="../src/FactSystem/ParameterManager.cc" line="1320"/>
       <source>Vehicle %1 did not respond to request for parameters. This will cause %2 to be unable to display its full user interface.</source>
       <translation type="unfinished">Vehicle %1 did not respond to request for parameters. This will cause %2 to be unable to display its full user interface.</translation>
     </message>
     <message>
-      <location filename="../src/FactSystem/ParameterManager.cc" line="1515"/>
+      <location filename="../src/FactSystem/ParameterManager.cc" line="1674"/>
       <source>%1 key is not a json object</source>
       <translation type="unfinished">%1 key is not a json object</translation>
     </message>
@@ -10452,208 +11538,222 @@ Is this really what you want?</translation>
   <context>
     <name>PlanManager</name>
     <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="176"/>
+      <location filename="../src/MissionManager/PlanManager.cc" line="177"/>
       <source>Internal error occurred during Mission Item communication: _ackTimeOut:_expectedAck == AckNone</source>
       <translation type="unfinished">Internal error occurred during Mission Item communication: _ackTimeOut:_expectedAck == AckNone</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="181"/>
+      <location filename="../src/MissionManager/PlanManager.cc" line="182"/>
       <source>Mission request list failed, maximum retries exceeded.</source>
       <translation type="unfinished">Mission request list failed, maximum retries exceeded.</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="185"/>
+      <location filename="../src/MissionManager/PlanManager.cc" line="186"/>
       <source>Retrying %1 REQUEST_LIST retry Count</source>
       <translation type="unfinished">Retrying %1 REQUEST_LIST retry Count</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="192"/>
+      <location filename="../src/MissionManager/PlanManager.cc" line="193"/>
       <source>Mission read failed, maximum retries exceeded.</source>
       <translation type="unfinished">Mission read failed, maximum retries exceeded.</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="196"/>
+      <location filename="../src/MissionManager/PlanManager.cc" line="197"/>
       <source>Retrying %1 MISSION_REQUEST retry Count</source>
       <translation type="unfinished">Retrying %1 MISSION_REQUEST retry Count</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="204"/>
+      <location filename="../src/MissionManager/PlanManager.cc" line="205"/>
       <source>Mission write failed, vehicle failed to send final ack.</source>
       <translation type="unfinished">Mission write failed, vehicle failed to send final ack.</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="209"/>
+      <location filename="../src/MissionManager/PlanManager.cc" line="210"/>
       <source>Mission write mission count failed, maximum retries exceeded.</source>
       <translation type="unfinished">Mission write mission count failed, maximum retries exceeded.</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="218"/>
+      <location filename="../src/MissionManager/PlanManager.cc" line="219"/>
       <source>Vehicle did not request all items from ground station: %1</source>
       <translation type="unfinished">Vehicle did not request all items from ground station: %1</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="226"/>
+      <location filename="../src/MissionManager/PlanManager.cc" line="227"/>
       <source>Mission remove all, maximum retries exceeded.</source>
       <translation type="unfinished">Mission remove all, maximum retries exceeded.</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="230"/>
+      <location filename="../src/MissionManager/PlanManager.cc" line="231"/>
       <source>Retrying %1 MISSION_CLEAR_ALL retry Count</source>
       <translation type="unfinished">Retrying %1 MISSION_CLEAR_ALL retry Count</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="237"/>
+      <location filename="../src/MissionManager/PlanManager.cc" line="238"/>
       <source>Vehicle did not respond to mission item communication: %1</source>
       <translation type="unfinished">Vehicle did not respond to mission item communication: %1</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="515"/>
+      <location filename="../src/MissionManager/PlanManager.cc" line="345"/>
+      <source>Internal Error: Call to Vehicle _requestNextMissionItem with no more indices to read</source>
+      <translation type="unfinished">Internal Error: Call to Vehicle _requestNextMissionItem with no more indices to read</translation>
+    </message>
+    <message>
+      <location filename="../src/MissionManager/PlanManager.cc" line="527"/>
       <source>Vehicle requested item outside range, count:request %1:%2. Send to Vehicle failed.</source>
       <translation type="unfinished">Vehicle requested item outside range, count:request %1:%2. Send to Vehicle failed.</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="619"/>
-      <location filename="../src/MissionManager/PlanManager.cc" line="624"/>
-      <location filename="../src/MissionManager/PlanManager.cc" line="638"/>
-      <source>Vehicle returned error: %1.</source>
-      <translation type="unfinished">Vehicle returned error: %1.</translation>
+      <location filename="../src/MissionManager/PlanManager.cc" line="662"/>
+      <source>Vehicle remove all failed. Error: %1</source>
+      <translation type="unfinished">Vehicle remove all failed. Error: %1</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="634"/>
-      <source>Vehicle did not request all items during write sequence, missed count %1.</source>
-      <translation type="unfinished">Vehicle did not request all items during write sequence, missed count %1.</translation>
+      <location filename="../src/MissionManager/PlanManager.cc" line="744"/>
+      <source>Item #%1 Command: %2</source>
+      <translation type="unfinished">Item #%1 Command: %2</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="645"/>
-      <source>Vehicle returned error: %1. Vehicle remove all failed.</source>
-      <translation type="unfinished">Vehicle returned error: %1. Vehicle remove all failed.</translation>
+      <location filename="../src/MissionManager/PlanManager.cc" line="748"/>
+      <source>Frame: %1</source>
+      <translation type="unfinished">Frame: %1</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="655"/>
-      <source>Vehicle returned error: %1. %2Vehicle did not accept guided item.</source>
-      <translation type="unfinished">Vehicle returned error: %1. %2Vehicle did not accept guided item.</translation>
+      <location filename="../src/MissionManager/PlanManager.cc" line="754"/>
+      <location filename="../src/MissionManager/PlanManager.cc" line="757"/>
+      <location filename="../src/MissionManager/PlanManager.cc" line="760"/>
+      <location filename="../src/MissionManager/PlanManager.cc" line="763"/>
+      <location filename="../src/MissionManager/PlanManager.cc" line="766"/>
+      <location filename="../src/MissionManager/PlanManager.cc" line="769"/>
+      <location filename="../src/MissionManager/PlanManager.cc" line="772"/>
+      <source>Value: %1</source>
+      <translation type="unfinished">Value: %1</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="768"/>
-      <source>Mission accepted (MAV_MISSION_ACCEPTED)</source>
-      <translation type="unfinished">Mission accepted (MAV_MISSION_ACCEPTED)</translation>
+      <location filename="../src/MissionManager/PlanManager.cc" line="791"/>
+      <source>Mission accepted.</source>
+      <translation type="unfinished">Mission accepted.</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="771"/>
-      <source>Unspecified error (MAV_MISSION_ERROR)</source>
-      <translation type="unfinished">Unspecified error (MAV_MISSION_ERROR)</translation>
+      <location filename="../src/MissionManager/PlanManager.cc" line="794"/>
+      <source>Unspecified error.</source>
+      <translation type="unfinished">Unspecified error.</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="774"/>
-      <source>Coordinate frame is not supported (MAV_MISSION_UNSUPPORTED_FRAME)</source>
-      <translation type="unfinished">Coordinate frame is not supported (MAV_MISSION_UNSUPPORTED_FRAME)</translation>
+      <location filename="../src/MissionManager/PlanManager.cc" line="797"/>
+      <source>Coordinate frame is not supported.</source>
+      <translation type="unfinished">Coordinate frame is not supported.</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="777"/>
-      <source>Command is not supported (MAV_MISSION_UNSUPPORTED)</source>
-      <translation type="unfinished">Command is not supported (MAV_MISSION_UNSUPPORTED)</translation>
+      <location filename="../src/MissionManager/PlanManager.cc" line="800"/>
+      <source>Command is not supported.</source>
+      <translation type="unfinished">Command is not supported.</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="780"/>
-      <source>Mission item exceeds storage space (MAV_MISSION_NO_SPACE)</source>
-      <translation type="unfinished">Mission item exceeds storage space (MAV_MISSION_NO_SPACE)</translation>
+      <location filename="../src/MissionManager/PlanManager.cc" line="803"/>
+      <source>Mission item exceeds storage space.</source>
+      <translation type="unfinished">Mission item exceeds storage space.</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="783"/>
-      <source>One of the parameters has an invalid value (MAV_MISSION_INVALID)</source>
-      <translation type="unfinished">One of the parameters has an invalid value (MAV_MISSION_INVALID)</translation>
+      <location filename="../src/MissionManager/PlanManager.cc" line="806"/>
+      <source>One of the parameters has an invalid value.</source>
+      <translation type="unfinished">One of the parameters has an invalid value.</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="786"/>
-      <source>Param1 has an invalid value (MAV_MISSION_INVALID_PARAM1)</source>
-      <translation type="unfinished">Param1 has an invalid value (MAV_MISSION_INVALID_PARAM1)</translation>
+      <location filename="../src/MissionManager/PlanManager.cc" line="809"/>
+      <source>Param 1 invalid value.</source>
+      <translation type="unfinished">Param 1 invalid value.</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="789"/>
-      <source>Param2 has an invalid value (MAV_MISSION_INVALID_PARAM2)</source>
-      <translation type="unfinished">Param2 has an invalid value (MAV_MISSION_INVALID_PARAM2)</translation>
+      <location filename="../src/MissionManager/PlanManager.cc" line="812"/>
+      <source>Param 2 invalid value.</source>
+      <translation type="unfinished">Param 2 invalid value.</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="792"/>
-      <source>Param3 has an invalid value (MAV_MISSION_INVALID_PARAM3)</source>
-      <translation type="unfinished">Param3 has an invalid value (MAV_MISSION_INVALID_PARAM3)</translation>
+      <location filename="../src/MissionManager/PlanManager.cc" line="815"/>
+      <source>Param 3 invalid value.</source>
+      <translation type="unfinished">Param 3 invalid value.</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="795"/>
-      <source>Param4 has an invalid value (MAV_MISSION_INVALID_PARAM4)</source>
-      <translation type="unfinished">Param4 has an invalid value (MAV_MISSION_INVALID_PARAM4)</translation>
+      <location filename="../src/MissionManager/PlanManager.cc" line="818"/>
+      <source>Param 4 invalid value.</source>
+      <translation type="unfinished">Param 4 invalid value.</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="798"/>
-      <source>X/Param5 has an invalid value (MAV_MISSION_INVALID_PARAM5_X)</source>
-      <translation type="unfinished">X/Param5 has an invalid value (MAV_MISSION_INVALID_PARAM5_X)</translation>
+      <location filename="../src/MissionManager/PlanManager.cc" line="821"/>
+      <source>Param 5 invalid value.</source>
+      <translation type="unfinished">Param 5 invalid value.</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="801"/>
-      <source>Y/Param6 has an invalid value (MAV_MISSION_INVALID_PARAM6_Y)</source>
-      <translation type="unfinished">Y/Param6 has an invalid value (MAV_MISSION_INVALID_PARAM6_Y)</translation>
+      <location filename="../src/MissionManager/PlanManager.cc" line="824"/>
+      <source>Param 6 invalid value.</source>
+      <translation type="unfinished">Param 6 invalid value.</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="804"/>
-      <source>Param7 has an invalid value (MAV_MISSION_INVALID_PARAM7)</source>
-      <translation type="unfinished">Param7 has an invalid value (MAV_MISSION_INVALID_PARAM7)</translation>
+      <location filename="../src/MissionManager/PlanManager.cc" line="827"/>
+      <source>Param 7 invalid value.</source>
+      <translation type="unfinished">Param 7 invalid value.</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="807"/>
-      <source>Received mission item out of sequence (MAV_MISSION_INVALID_SEQUENCE)</source>
-      <translation type="unfinished">Received mission item out of sequence (MAV_MISSION_INVALID_SEQUENCE)</translation>
+      <location filename="../src/MissionManager/PlanManager.cc" line="830"/>
+      <source>Received mission item out of sequence.</source>
+      <translation type="unfinished">Received mission item out of sequence.</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="810"/>
-      <source>Not accepting any mission commands (MAV_MISSION_DENIED)</source>
-      <translation type="unfinished">Not accepting any mission commands (MAV_MISSION_DENIED)</translation>
+      <location filename="../src/MissionManager/PlanManager.cc" line="833"/>
+      <source>Not accepting any mission commands.</source>
+      <translation type="unfinished">Not accepting any mission commands.</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="814"/>
-      <source>QGC Internal Error</source>
-      <translation type="unfinished">QGC Internal Error</translation>
+      <location filename="../src/MissionManager/PlanManager.cc" line="837"/>
+      <source>Unknown error: %1.</source>
+      <translation type="unfinished">Unknown error: %1.</translation>
+    </message>
+    <message>
+      <location filename="../src/MissionManager/PlanManager.cc" line="673"/>
+      <source>Vehicle returned error: %1. %2Vehicle did not accept guided item.</source>
+      <translation type="unfinished">Vehicle returned error: %1. %2Vehicle did not accept guided item.</translation>
     </message>
   </context>
   <context>
     <name>PlanMasterController</name>
     <message>
-      <location filename="../src/MissionManager/PlanMasterController.cc" line="179"/>
+      <location filename="../src/MissionManager/PlanMasterController.cc" line="209"/>
       <source>Download not supported on high latency links.</source>
       <translation type="unfinished">Download not supported on high latency links.</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/PlanMasterController.cc" line="277"/>
+      <location filename="../src/MissionManager/PlanMasterController.cc" line="316"/>
       <source>Upload not supported on high latency links.</source>
       <translation type="unfinished">Upload not supported on high latency links.</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/PlanMasterController.cc" line="296"/>
+      <location filename="../src/MissionManager/PlanMasterController.cc" line="335"/>
       <source>Error loading Plan file (%1). %2</source>
       <translation type="unfinished">Error loading Plan file (%1). %2</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/PlanMasterController.cc" line="422"/>
+      <location filename="../src/MissionManager/PlanMasterController.cc" line="461"/>
       <source>Plan save error %1 : %2</source>
       <translation type="unfinished">Plan save error %1 : %2</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/PlanMasterController.cc" line="454"/>
+      <location filename="../src/MissionManager/PlanMasterController.cc" line="493"/>
       <source>KML save error %1 : %2</source>
       <translation type="unfinished">KML save error %1 : %2</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/PlanMasterController.cc" line="525"/>
+      <location filename="../src/MissionManager/PlanMasterController.cc" line="564"/>
       <source>Supported types (*.%1 *.%2 *.%3 *.%4)</source>
       <translation type="unfinished">Supported types (*.%1 *.%2 *.%3 *.%4)</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/PlanMasterController.cc" line="526"/>
-      <location filename="../src/MissionManager/PlanMasterController.cc" line="535"/>
+      <location filename="../src/MissionManager/PlanMasterController.cc" line="565"/>
+      <location filename="../src/MissionManager/PlanMasterController.cc" line="574"/>
       <source>All Files (*.*)</source>
       <translation type="unfinished">All Files (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/PlanMasterController.cc" line="535"/>
+      <location filename="../src/MissionManager/PlanMasterController.cc" line="574"/>
       <source>Plan Files (*.%1)</source>
       <translation type="unfinished">Plan Files (*.%1)</translation>
     </message>
@@ -10661,78 +11761,78 @@ Is this really what you want?</translation>
   <context>
     <name>PlanToolBarIndicators</name>
     <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="124"/>
+      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="123"/>
       <source>Selected Waypoint</source>
       <translation type="unfinished">Selected Waypoint</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="129"/>
+      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="128"/>
       <source>Alt diff:</source>
       <translation type="unfinished">Alt diff:</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="138"/>
+      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="137"/>
       <source>Azimuth:</source>
       <translation type="unfinished">Azimuth:</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="147"/>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="183"/>
+      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="146"/>
+      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="182"/>
       <source>Distance:</source>
       <translation type="unfinished">Distance:</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="154"/>
+      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="153"/>
       <source>Gradient:</source>
       <translation type="unfinished">Gradient:</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="163"/>
+      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="162"/>
       <source>Heading:</source>
       <translation type="unfinished">Heading:</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="178"/>
+      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="177"/>
       <source>Total Mission</source>
       <translation type="unfinished">Total Mission</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="192"/>
+      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="191"/>
       <source>Max telem dist:</source>
       <translation type="unfinished">Max telem dist:</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="199"/>
+      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="198"/>
       <source>Time:</source>
       <translation type="unfinished">Time:</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="215"/>
+      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="214"/>
       <source>Battery</source>
       <translation type="unfinished">Battery</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="220"/>
+      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="219"/>
       <source>Batteries required:</source>
       <translation type="unfinished">Batteries required:</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="245"/>
+      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="231"/>
       <source>Upload Required</source>
       <translation type="unfinished">Upload Required</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="245"/>
+      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="231"/>
       <source>Upload</source>
       <translation type="unfinished">Upload</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="316"/>
+      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="293"/>
       <source>Syncing Mission</source>
       <translation type="unfinished">Syncing Mission</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="324"/>
+      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="301"/>
       <source>Click anywhere to hide</source>
       <translation type="unfinished">Click anywhere to hide</translation>
     </message>
@@ -10775,235 +11875,226 @@ Is this really what you want?</translation>
       <translation type="unfinished">You need at least one item to create a KML.</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/PlanView.qml" line="189"/>
-      <source>Unable to Save/Upload</source>
-      <translation type="unfinished">Unable to Save/Upload</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="189"/>
+      <location filename="../src/PlanView/PlanView.qml" line="195"/>
       <source>Plan is waiting on terrain data from server for correct altitude values.</source>
       <translation type="unfinished">Plan is waiting on terrain data from server for correct altitude values.</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/PlanView.qml" line="198"/>
+      <location filename="../src/PlanView/PlanView.qml" line="214"/>
       <source>Plan Upload</source>
       <translation type="unfinished">Plan Upload</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/PlanView.qml" line="205"/>
+      <location filename="../src/PlanView/PlanView.qml" line="221"/>
       <source>Select Plan File</source>
       <translation type="unfinished">Select Plan File</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/PlanView.qml" line="219"/>
+      <location filename="../src/PlanView/PlanView.qml" line="234"/>
       <source>Save Plan</source>
       <translation type="unfinished">Save Plan</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/PlanView.qml" line="233"/>
-      <source>Load Shape</source>
-      <translation type="unfinished">Load Shape</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="247"/>
+      <location filename="../src/PlanView/PlanView.qml" line="251"/>
       <source>Save KML</source>
       <translation type="unfinished">Save KML</translation>
     </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="355"/>
-      <source>Create which pattern type?</source>
-      <translation type="unfinished">Create which pattern type?</translation>
-    </message>
     <message>
       <location filename="../src/PlanView/PlanView.qml" line="359"/>
-      <source>Survey</source>
-      <translation type="unfinished">Survey</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="363"/>
-      <source>Structure Scan</source>
-      <translation type="unfinished">Structure Scan</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="389"/>
       <source>Move the selected mission item to the be after following mission item:</source>
       <translation type="unfinished">Move the selected mission item to the be after following mission item:</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/PlanView.qml" line="551"/>
-      <source>Fly</source>
-      <translation type="unfinished">Fly</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="555"/>
+      <location filename="../src/PlanView/PlanView.qml" line="594"/>
       <source>File</source>
       <translation type="unfinished">File</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/PlanView.qml" line="561"/>
+      <location filename="../src/PlanView/PlanView.qml" line="613"/>
       <source>Waypoint</source>
       <translation type="unfinished">Waypoint</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/PlanView.qml" line="566"/>
+      <location filename="../src/PlanView/PlanView.qml" line="623"/>
       <source>ROI</source>
       <translation type="unfinished">ROI</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/PlanView.qml" line="571"/>
+      <location filename="../src/PlanView/PlanView.qml" line="639"/>
       <source>Pattern</source>
       <translation type="unfinished">Pattern</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/PlanView.qml" line="576"/>
+      <location filename="../src/PlanView/PlanView.qml" line="662"/>
       <source>Center</source>
       <translation type="unfinished">Center</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/PlanView.qml" line="581"/>
-      <source>In</source>
-      <translation type="unfinished">In</translation>
+      <location filename="../src/PlanView/PlanView.qml" line="576"/>
+      <location filename="../src/PlanView/PlanView.qml" line="739"/>
+      <source>Plan</source>
+      <translation type="unfinished">Plan</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/PlanView.qml" line="585"/>
-      <source>Out</source>
-      <translation type="unfinished">Out</translation>
+      <location filename="../src/PlanView/PlanView.qml" line="603"/>
+      <source>Takeoff</source>
+      <translation type="unfinished">Takeoff</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/PlanView.qml" line="673"/>
-      <location filename="../src/PlanView/PlanView.qml" line="724"/>
-      <source>Plan</source>
-      <translation type="unfinished">Plan</translation>
+      <location filename="../src/PlanView/PlanView.qml" line="613"/>
+      <source>Rally Point</source>
+      <translation type="unfinished">Rally Point</translation>
+    </message>
+    <message>
+      <location filename="../src/PlanView/PlanView.qml" line="623"/>
+      <source>Cancel ROI</source>
+      <translation type="unfinished">Cancel ROI</translation>
+    </message>
+    <message>
+      <location filename="../src/PlanView/PlanView.qml" line="652"/>
+      <source>Return</source>
+      <translation type="unfinished">Return</translation>
+    </message>
+    <message>
+      <location filename="../src/PlanView/PlanView.qml" line="652"/>
+      <source>Land</source>
+      <translation type="unfinished">Land</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/PlanView.qml" line="731"/>
+      <location filename="../src/PlanView/PlanView.qml" line="771"/>
       <source>Mission</source>
       <translation type="unfinished">Mission</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/PlanView.qml" line="739"/>
+      <location filename="../src/PlanView/PlanView.qml" line="774"/>
       <source>Fence</source>
       <translation type="unfinished">Fence</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/PlanView.qml" line="746"/>
+      <location filename="../src/PlanView/PlanView.qml" line="778"/>
       <source>Rally</source>
       <translation type="unfinished">Rally</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/PlanView.qml" line="857"/>
+      <location filename="../src/PlanView/PlanView.qml" line="896"/>
       <source>You have unsaved/unsent changes. Loading from the Vehicle will lose these changes. Are you sure you want to load from the Vehicle?</source>
       <translation type="unfinished">You have unsaved/unsent changes. Loading from the Vehicle will lose these changes. Are you sure you want to load from the Vehicle?</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/PlanView.qml" line="869"/>
+      <location filename="../src/PlanView/PlanView.qml" line="908"/>
       <source>You have unsaved/unsent changes. Loading from a file will lose these changes. Are you sure you want to load from a file?</source>
       <translation type="unfinished">You have unsaved/unsent changes. Loading from a file will lose these changes. Are you sure you want to load from a file?</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/PlanView.qml" line="880"/>
-      <source>Are you sure you want to remove all items and create a new plan? </source>
-      <translation type="unfinished">Are you sure you want to remove all items and create a new plan? </translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="881"/>
-      <source>This will also remove all items from the vehicle.</source>
-      <translation type="unfinished">This will also remove all items from the vehicle.</translation>
+      <location filename="../src/PlanView/PlanView.qml" line="1182"/>
+      <source>Clear</source>
+      <translation type="unfinished">Clear</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/PlanView.qml" line="896"/>
+      <location filename="../src/PlanView/PlanView.qml" line="932"/>
       <source>Are you sure you want to remove all mission items and clear the mission from the vehicle?</source>
       <translation type="unfinished">Are you sure you want to remove all mission items and clear the mission from the vehicle?</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/PlanView.qml" line="921"/>
+      <location filename="../src/PlanView/PlanView.qml" line="958"/>
       <source>Create complex pattern:</source>
       <translation type="unfinished">Create complex pattern:</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/PlanView.qml" line="947"/>
-      <source>Load KML/SHP...</source>
-      <translation type="unfinished">Load KML/SHP...</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="965"/>
+      <location filename="../src/PlanView/PlanView.qml" line="983"/>
       <source>Mission overwrite</source>
       <translation type="unfinished">Mission overwrite</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/PlanView.qml" line="965"/>
+      <location filename="../src/PlanView/PlanView.qml" line="983"/>
       <source>GeoFence overwrite</source>
       <translation type="unfinished">GeoFence overwrite</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/PlanView.qml" line="965"/>
+      <location filename="../src/PlanView/PlanView.qml" line="983"/>
       <source>Rally Points overwrite</source>
       <translation type="unfinished">Rally Points overwrite</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/PlanView.qml" line="972"/>
-      <source>You have unsaved changes. You should upload to your vehicle, or save to a file:</source>
-      <translation type="unfinished">You have unsaved changes. You should upload to your vehicle, or save to a file:</translation>
+      <location filename="../src/PlanView/PlanView.qml" line="991"/>
+      <source>You have unsaved changes.</source>
+      <translation type="unfinished">You have unsaved changes.</translation>
+    </message>
+    <message>
+      <location filename="../src/PlanView/PlanView.qml" line="1090"/>
+      <source>Open...</source>
+      <translation type="unfinished">Open...</translation>
+    </message>
+    <message>
+      <location filename="../src/PlanView/PlanView.qml" line="189"/>
+      <location filename="../src/PlanView/PlanView.qml" line="194"/>
+      <location filename="../src/PlanView/PlanView.qml" line="1104"/>
+      <source>Save</source>
+      <translation type="unfinished">Save</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/PlanView.qml" line="973"/>
-      <source>You have unsaved changes.</source>
-      <translation type="unfinished">You have unsaved changes.</translation>
+      <location filename="../src/PlanView/PlanView.qml" line="190"/>
+      <location filename="../src/PlanView/PlanView.qml" line="195"/>
+      <source>Unable to %1</source>
+      <translation type="unfinished">Unable to %1</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/PlanView.qml" line="975"/>
-      <source>Plan File:</source>
-      <translation type="unfinished">Plan File:</translation>
+      <location filename="../src/PlanView/PlanView.qml" line="190"/>
+      <source>Plan has incomplete items. Complete all items and %1 again.</source>
+      <translation type="unfinished">Plan has incomplete items. Complete all items and %1 again.</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/PlanView.qml" line="986"/>
-      <source>New...</source>
-      <translation type="unfinished">New...</translation>
+      <location filename="../src/PlanView/PlanView.qml" line="921"/>
+      <source>Are you sure you want to remove current plan and create a new plan? </source>
+      <translation type="unfinished">Are you sure you want to remove current plan and create a new plan? </translation>
     </message>
     <message>
-      <location filename="../src/PlanView/PlanView.qml" line="991"/>
-      <source>New Plan</source>
-      <translation type="unfinished">New Plan</translation>
+      <location filename="../src/PlanView/PlanView.qml" line="990"/>
+      <source>You have unsaved changes. You should upload to your vehicle, or save to a file.</source>
+      <translation type="unfinished">You have unsaved changes. You should upload to your vehicle, or save to a file.</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/PlanView.qml" line="996"/>
-      <source>Open...</source>
-      <translation type="unfinished">Open...</translation>
+      <location filename="../src/PlanView/PlanView.qml" line="998"/>
+      <location filename="../src/PlanView/PlanView.qml" line="1050"/>
+      <source>Create Plan</source>
+      <translation type="unfinished">Create Plan</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1010"/>
-      <source>Save</source>
-      <translation type="unfinished">Save</translation>
+      <location filename="../src/PlanView/PlanView.qml" line="1069"/>
+      <source>Storage</source>
+      <translation type="unfinished">Storage</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1024"/>
+      <location filename="../src/PlanView/PlanView.qml" line="1118"/>
       <source>Save As...</source>
       <translation type="unfinished">Save As...</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1034"/>
+      <location filename="../src/PlanView/PlanView.qml" line="1130"/>
       <source>Save Mission Waypoints As KML...</source>
       <translation type="unfinished">Save Mission Waypoints As KML...</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1040"/>
+      <location filename="../src/PlanView/PlanView.qml" line="1135"/>
       <source>KML</source>
       <translation type="unfinished">KML</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1059"/>
+      <location filename="../src/PlanView/PlanView.qml" line="189"/>
+      <location filename="../src/PlanView/PlanView.qml" line="194"/>
+      <location filename="../src/PlanView/PlanView.qml" line="1156"/>
       <source>Upload</source>
       <translation type="unfinished">Upload</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1070"/>
-      <source>Download</source>
-      <translation type="unfinished">Download</translation>
+      <location filename="../src/PlanView/PlanView.qml" line="1147"/>
+      <source>Vehicle</source>
+      <translation type="unfinished">Vehicle</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1085"/>
-      <source>Clear Vehicle Mission</source>
-      <translation type="unfinished">Clear Vehicle Mission</translation>
+      <location filename="../src/PlanView/PlanView.qml" line="1167"/>
+      <source>Download</source>
+      <translation type="unfinished">Download</translation>
     </message>
   </context>
   <context>
@@ -11422,7 +12513,7 @@ Is this really what you want?</translation>
   <context>
     <name>PreFlightCheckButton</name>
     <message>
-      <location filename="../src/QmlControls/PreFlightCheckButton.qml" line="53"/>
+      <location filename="../src/QmlControls/PreFlightCheckButton.qml" line="54"/>
       <source>Passed</source>
       <translation type="unfinished">Passed</translation>
     </message>
@@ -11430,7 +12521,7 @@ Is this really what you want?</translation>
   <context>
     <name>PreFlightCheckGroup</name>
     <message>
-      <location filename="../src/QmlControls/PreFlightCheckGroup.qml" line="46"/>
+      <location filename="../src/QmlControls/PreFlightCheckGroup.qml" line="50"/>
       <source> (passed)</source>
       <translation type="unfinished"> (passed)</translation>
     </message>
@@ -11438,21 +12529,32 @@ Is this really what you want?</translation>
   <context>
     <name>PreFlightCheckList</name>
     <message>
-      <location filename="../src/QmlControls/PreFlightCheckList.qml" line="77"/>
+      <location filename="../src/FlightDisplay/PreFlightCheckList.qml" line="151"/>
+      <location filename="../src/QmlControls/PreFlightCheckList.qml" line="81"/>
       <source>Pre-Flight Checklist %1</source>
       <translation type="unfinished">Pre-Flight Checklist %1</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/PreFlightCheckList.qml" line="77"/>
+      <location filename="../src/FlightDisplay/PreFlightCheckList.qml" line="151"/>
+      <location filename="../src/QmlControls/PreFlightCheckList.qml" line="81"/>
       <source>(passed)</source>
       <translation type="unfinished">(passed)</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/PreFlightCheckList.qml" line="88"/>
+      <location filename="../src/FlightDisplay/PreFlightCheckList.qml" line="161"/>
+      <location filename="../src/QmlControls/PreFlightCheckList.qml" line="93"/>
       <source>Reset the checklist (e.g. after a vehicle reboot)</source>
       <translation type="unfinished">Reset the checklist (e.g. after a vehicle reboot)</translation>
     </message>
   </context>
+  <context>
+    <name>PreFlightCheckListShowAction</name>
+    <message>
+      <location filename="../src/FlightDisplay/PreFlightCheckListShowAction.qml" line="14"/>
+      <source>Checklist</source>
+      <translation type="unfinished">Checklist</translation>
+    </message>
+  </context>
   <context>
     <name>PreFlightGPSCheck</name>
     <message>
@@ -11558,722 +12660,380 @@ Is this really what you want?</translation>
   <context>
     <name>QGCApplication</name>
     <message>
-      <location filename="../src/QGCApplication.cc" line="175"/>
-      <source>You are running %1 as root. You should not do this since it will cause other issues with %1. %1 will now exit. If you are having serial port issues on Ubuntu, execute the following commands to fix most issues:
-sudo usermod -a -G dialout $USER
-sudo apt-get remove modemmanager</source>
-      <translation type="unfinished">You are running %1 as root. You should not do this since it will cause other issues with %1. %1 will now exit. If you are having serial port issues on Ubuntu, execute the following commands to fix most issues:
-sudo usermod -a -G dialout $USER
-sudo apt-get remove modemmanager</translation>
+      <location filename="../src/QGCApplication.cc" line="200"/>
+      <source>You are running %1 as root. You should not do this since it will cause other issues with %1.%1 will now exit.&lt;br/&gt;&lt;br/&gt;If you are having serial port issues on Ubuntu, execute the following commands to fix most issues:&lt;br/&gt;&lt;pre&gt;sudo usermod -a -G dialout $USER&lt;br/&gt;sudo apt-get remove modemmanager&lt;/pre&gt;</source>
+      <translation type="unfinished">You are running %1 as root. You should not do this since it will cause other issues with %1.%1 will now exit.&lt;br/&gt;&lt;br/&gt;If you are having serial port issues on Ubuntu, execute the following commands to fix most issues:&lt;br/&gt;&lt;pre&gt;sudo usermod -a -G dialout $USER&lt;br/&gt;sudo apt-get remove modemmanager&lt;/pre&gt;</translation>
+    </message>
+    <message>
+      <location filename="../src/QGCApplication.cc" line="216"/>
+      <source>The current user does not have the correct permissions to access serial devices. You should also remove modemmanager since it also interferes.&lt;br/&gt;&lt;br/&gt;If you are using Ubuntu, execute the following commands to fix these issues:&lt;br/&gt;&lt;pre&gt;sudo usermod -a -G dialout $USER&lt;br/&gt;sudo apt-get remove modemmanager&lt;/pre&gt;</source>
+      <translation type="unfinished">The current user does not have the correct permissions to access serial devices. You should also remove modemmanager since it also interferes.&lt;br/&gt;&lt;br/&gt;If you are using Ubuntu, execute the following commands to fix these issues:&lt;br/&gt;&lt;pre&gt;sudo usermod -a -G dialout $USER&lt;br/&gt;sudo apt-get remove modemmanager&lt;/pre&gt;</translation>
     </message>
     <message>
-      <location filename="../src/QGCApplication.cc" line="553"/>
+      <location filename="../src/QGCApplication.cc" line="627"/>
       <source>The format for %1 saved settings has been modified. Your saved settings have been reset to defaults.</source>
       <translation type="unfinished">The format for %1 saved settings has been modified. Your saved settings have been reset to defaults.</translation>
     </message>
     <message>
-      <location filename="../src/QGCApplication.cc" line="561"/>
+      <location filename="../src/QGCApplication.cc" line="635"/>
       <source>The Offline Map Cache database has been upgraded. Your old map cache sets have been reset.</source>
       <translation type="unfinished">The Offline Map Cache database has been upgraded. Your old map cache sets have been reset.</translation>
     </message>
     <message>
-      <location filename="../src/QGCApplication.cc" line="632"/>
+      <location filename="../src/QGCApplication.cc" line="703"/>
       <source>Unable to save telemetry log. Error copying telemetry to &apos;%1&apos;: &apos;%2&apos;.</source>
       <translation type="unfinished">Unable to save telemetry log. Error copying telemetry to &apos;%1&apos;: &apos;%2&apos;.</translation>
     </message>
     <message>
-      <location filename="../src/QGCApplication.cc" line="647"/>
-      <source>Telemetry save error</source>
-      <translation type="unfinished">Telemetry save error</translation>
+      <location filename="../src/QGCApplication.cc" line="761"/>
+      <source>Parameters are missing from firmware. You may be running a version of firmware which is not fully supported or your firmware has a bug in it. Missing params: %1</source>
+      <translation type="unfinished">Parameters are missing from firmware. You may be running a version of firmware which is not fully supported or your firmware has a bug in it. Missing params: %1</translation>
     </message>
     <message>
-      <location filename="../src/QGCApplication.cc" line="651"/>
+      <location filename="../src/QGCApplication.cc" line="720"/>
       <source>Unable to save telemetry log. Application save directory is not set.</source>
       <translation type="unfinished">Unable to save telemetry log. Application save directory is not set.</translation>
     </message>
     <message>
-      <location filename="../src/QGCApplication.cc" line="659"/>
+      <location filename="../src/QGCApplication.cc" line="727"/>
       <source>Unable to save telemetry log. Telemetry save directory &quot;%1&quot; does not exist.</source>
       <translation type="unfinished">Unable to save telemetry log. Telemetry save directory &quot;%1&quot; does not exist.</translation>
     </message>
+  </context>
+  <context>
+    <name>QGCControlDebug</name>
     <message>
-      <location filename="../src/QGCApplication.cc" line="687"/>
-      <source>Parameters are missing from firmware. You may be running a version of firmware QGC does not work correctly with or your firmware has a bug in it. Missing params: %1</source>
-      <translation type="unfinished">Parameters are missing from firmware. You may be running a version of firmware QGC does not work correctly with or your firmware has a bug in it. Missing params: %1</translation>
+      <location filename="../src/QmlControls/QGCControlDebug.qml" line="22"/>
+      <source>%1 x:%2 y:%3 width:%4 height:%5 visible: %6 enabled: %7 z:%8 parent:%9 implicitWidth/Height:%10:%11</source>
+      <comment>Do not translate</comment>
+      <translation type="unfinished">%1 x:%2 y:%3 width:%4 height:%5 visible: %6 enabled: %7 z:%8 parent:%9 implicitWidth/Height:%10:%11</translation>
     </message>
   </context>
   <context>
     <name>QGCCorePlugin</name>
     <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="131"/>
+      <location filename="../src/api/QGCCorePlugin.cc" line="223"/>
       <source>General</source>
       <translation type="unfinished">General</translation>
     </message>
     <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="135"/>
+      <location filename="../src/api/QGCCorePlugin.cc" line="227"/>
       <source>Comm Links</source>
       <translation type="unfinished">Comm Links</translation>
     </message>
     <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="139"/>
+      <location filename="../src/api/QGCCorePlugin.cc" line="231"/>
       <source>Offline Maps</source>
       <translation type="unfinished">Offline Maps</translation>
     </message>
     <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="144"/>
+      <location filename="../src/api/QGCCorePlugin.cc" line="236"/>
       <source>Taisync</source>
       <translation type="unfinished">Taisync</translation>
     </message>
     <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="150"/>
+      <location filename="../src/api/QGCCorePlugin.cc" line="242"/>
       <source>Microhard</source>
       <translation type="unfinished">Microhard</translation>
     </message>
     <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="156"/>
+      <location filename="../src/api/QGCCorePlugin.cc" line="248"/>
       <source>AirMap</source>
       <translation type="unfinished">AirMap</translation>
     </message>
     <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="161"/>
+      <location filename="../src/api/QGCCorePlugin.cc" line="253"/>
       <source>MAVLink</source>
       <translation type="unfinished">MAVLink</translation>
     </message>
     <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="165"/>
+      <location filename="../src/api/QGCCorePlugin.cc" line="257"/>
       <source>Console</source>
       <translation type="unfinished">Console</translation>
     </message>
     <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="168"/>
+      <location filename="../src/api/QGCCorePlugin.cc" line="260"/>
       <source>Help</source>
       <translation type="unfinished">Help</translation>
     </message>
     <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="173"/>
+      <location filename="../src/api/QGCCorePlugin.cc" line="265"/>
       <source>Mock Link</source>
       <translation type="unfinished">Mock Link</translation>
     </message>
     <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="176"/>
+      <location filename="../src/api/QGCCorePlugin.cc" line="268"/>
       <source>Debug</source>
       <translation type="unfinished">Debug</translation>
     </message>
     <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="179"/>
+      <location filename="../src/api/QGCCorePlugin.cc" line="271"/>
       <source>Palette Test</source>
       <translation type="unfinished">Palette Test</translation>
     </message>
     <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="190"/>
+      <location filename="../src/api/QGCCorePlugin.cc" line="282"/>
       <source>Values</source>
       <translation type="unfinished">Values</translation>
     </message>
     <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="191"/>
+      <location filename="../src/api/QGCCorePlugin.cc" line="283"/>
       <source>Camera</source>
       <translation type="unfinished">Camera</translation>
     </message>
     <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="193"/>
-      <source>Video Stream</source>
-      <translation type="unfinished">Video Stream</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="195"/>
-      <source>Health</source>
-      <translation type="unfinished">Health</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="196"/>
-      <source>Vibration</source>
-      <translation type="unfinished">Vibration</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="291"/>
-      <source>WARNING: You are about to enter Advanced Mode. If used incorrectly, this may cause your vehicle to malfunction thus voiding your warranty. You should do so only if instructed by customer support. Are you sure you want to enable Advanced Mode?</source>
-      <translation type="unfinished">WARNING: You are about to enter Advanced Mode. If used incorrectly, this may cause your vehicle to malfunction thus voiding your warranty. You should do so only if instructed by customer support. Are you sure you want to enable Advanced Mode?</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCFenceCircle</name>
-    <message>
-      <location filename="../src/MissionManager/QGCFenceCircle.cc" line="75"/>
-      <source>GeoFence Circle only supports version %1</source>
-      <translation type="unfinished">GeoFence Circle only supports version %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCFencePolygon</name>
-    <message>
-      <location filename="../src/MissionManager/QGCFencePolygon.cc" line="68"/>
-      <source>GeoFence Polygon only supports version %1</source>
-      <translation type="unfinished">GeoFence Polygon only supports version %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCFileDialog</name>
-    <message>
-      <location filename="../src/QmlControls/QGCFileDialog.qml" line="137"/>
-      <location filename="../src/QmlControls/QGCFileDialog.qml" line="250"/>
-      <source>Delete</source>
-      <translation type="unfinished">Delete</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCFileDialog.qml" line="148"/>
-      <source>No files</source>
-      <translation type="unfinished">No files</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCFileDialog.qml" line="189"/>
-      <source>New file name:</source>
-      <translation type="unfinished">New file name:</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCFileDialog.qml" line="202"/>
-      <source>File names must end with .%1 file extension. If missing it will be added.</source>
-      <translation type="unfinished">File names must end with .%1 file extension. If missing it will be added.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCFileDialog.qml" line="210"/>
-      <source>The file %1 exists. Click Save again to replace it.</source>
-      <translation type="unfinished">The file %1 exists. Click Save again to replace it.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCFileDialog.qml" line="218"/>
-      <source>Save to existing file:</source>
-      <translation type="unfinished">Save to existing file:</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCFileDownload</name>
-    <message>
-      <location filename="../src/QGCFileDownload.cc" line="119"/>
-      <source>Could not save downloaded file to %1. Error: %2</source>
-      <translation type="unfinished">Could not save downloaded file to %1. Error: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCFileDownload.cc" line="142"/>
-      <source>Download cancelled</source>
-      <translation type="unfinished">Download cancelled</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCFileDownload.cc" line="145"/>
-      <source>Error: File Not Found</source>
-      <translation type="unfinished">Error: File Not Found</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCFileDownload.cc" line="148"/>
-      <source>Error during download. Error: %1</source>
-      <translation type="unfinished">Error during download. Error: %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCFlightGearLink</name>
-    <message>
-      <location filename="../src/comm/QGCFlightGearLink.cc" line="61"/>
-      <source>FlightGear 3.0+ Link (port:%1)</source>
-      <translation type="unfinished">FlightGear 3.0+ Link (port:%1)</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCFlightGearLink.cc" line="150"/>
-      <location filename="../src/comm/QGCFlightGearLink.cc" line="889"/>
-      <source>FlightGear Failed to Start</source>
-      <translation type="unfinished">FlightGear Failed to Start</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCFlightGearLink.cc" line="153"/>
-      <source>FlightGear Crashed</source>
-      <translation type="unfinished">FlightGear Crashed</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCFlightGearLink.cc" line="153"/>
-      <source>This is a FlightGear-related problem. Please upgrade FlightGear</source>
-      <translation type="unfinished">This is a FlightGear-related problem. Please upgrade FlightGear</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCFlightGearLink.cc" line="156"/>
-      <source>FlightGear Start Timed Out</source>
-      <translation type="unfinished">FlightGear Start Timed Out</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCFlightGearLink.cc" line="156"/>
-      <location filename="../src/comm/QGCFlightGearLink.cc" line="159"/>
-      <location filename="../src/comm/QGCFlightGearLink.cc" line="162"/>
-      <source>Please check if the path and command is correct</source>
-      <translation type="unfinished">Please check if the path and command is correct</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCFlightGearLink.cc" line="159"/>
-      <location filename="../src/comm/QGCFlightGearLink.cc" line="162"/>
-      <source>Could not Communicate with FlightGear</source>
-      <translation type="unfinished">Could not Communicate with FlightGear</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCFlightGearLink.cc" line="166"/>
-      <source>FlightGear Error</source>
-      <translation type="unfinished">FlightGear Error</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCFlightGearLink.cc" line="166"/>
-      <source>Please check if the path and command is correct.</source>
-      <translation type="unfinished">Please check if the path and command is correct.</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCFlightGearLink.cc" line="291"/>
-      <location filename="../src/comm/QGCFlightGearLink.cc" line="535"/>
-      <location filename="../src/comm/QGCFlightGearLink.cc" line="619"/>
-      <location filename="../src/comm/QGCFlightGearLink.cc" line="783"/>
-      <location filename="../src/comm/QGCFlightGearLink.cc" line="811"/>
-      <location filename="../src/comm/QGCFlightGearLink.cc" line="821"/>
-      <location filename="../src/comm/QGCFlightGearLink.cc" line="835"/>
-      <location filename="../src/comm/QGCFlightGearLink.cc" line="842"/>
-      <location filename="../src/comm/QGCFlightGearLink.cc" line="850"/>
-      <location filename="../src/comm/QGCFlightGearLink.cc" line="867"/>
-      <location filename="../src/comm/QGCFlightGearLink.cc" line="879"/>
-      <location filename="../src/comm/QGCFlightGearLink.cc" line="881"/>
-      <source>FlightGear HIL</source>
-      <translation type="unfinished">FlightGear HIL</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCFlightGearLink.cc" line="292"/>
-      <source>Flight Gear protocol file &apos;%1&apos; is out of date. Quit %2. Delete the file and restart %2 to fix.</source>
-      <translation type="unfinished">Flight Gear protocol file &apos;%1&apos; is out of date. Quit %2. Delete the file and restart %2 to fix.</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCFlightGearLink.cc" line="535"/>
-      <location filename="../src/comm/QGCFlightGearLink.cc" line="619"/>
-      <source>FlightGear failed to start. There are mismatched quotes in specified command line options</source>
-      <translation type="unfinished">FlightGear failed to start. There are mismatched quotes in specified command line options</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCFlightGearLink.cc" line="779"/>
-      <source>--fg-root directory specified from ui option not found: %1</source>
-      <translation type="unfinished">--fg-root directory specified from ui option not found: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCFlightGearLink.cc" line="781"/>
-      <source>Unable to automatically determine --fg-root directory location. You will need to specify --fg-root=&lt;directory&gt; as an additional command line parameter from ui.</source>
-      <translation type="unfinished">Unable to automatically determine --fg-root directory location. You will need to specify --fg-root=&lt;directory&gt; as an additional command line parameter from ui.</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCFlightGearLink.cc" line="807"/>
-      <source>--fg-scenery directory specified from ui option not found: %1</source>
-      <translation type="unfinished">--fg-scenery directory specified from ui option not found: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCFlightGearLink.cc" line="809"/>
-      <source>Unable to automatically determine --fg-scenery directory location. You will need to specify --fg-scenery=directory as an additional command line parameter from ui.</source>
-      <translation type="unfinished">Unable to automatically determine --fg-scenery directory location. You will need to specify --fg-scenery=directory as an additional command line parameter from ui.</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCFlightGearLink.cc" line="821"/>
-      <source>Incorrect %1 installation. Aircraft directory is missing: &apos;%2&apos;.</source>
-      <translation type="unfinished">Incorrect %1 installation. Aircraft directory is missing: &apos;%2&apos;.</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCFlightGearLink.cc" line="835"/>
-      <source>Incorrect FlightGear setup. Protocol directory is missing: &apos;%1&apos;. Command line parameter for --fg-root may be set incorrectly.</source>
-      <translation type="unfinished">Incorrect FlightGear setup. Protocol directory is missing: &apos;%1&apos;. Command line parameter for --fg-root may be set incorrectly.</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCFlightGearLink.cc" line="842"/>
-      <source>Incorrect installation. Protocol directory is missing (%1).</source>
-      <translation type="unfinished">Incorrect installation. Protocol directory is missing (%1).</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCFlightGearLink.cc" line="850"/>
-      <source>Incorrect installation. FlightGear protocol file missing: %1</source>
-      <translation type="unfinished">Incorrect installation. FlightGear protocol file missing: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCFlightGearLink.cc" line="867"/>
-      <source>Unable to verify that protocol file %1 is current. If file is out of date, you may experience problems. Safest approach is to delete the file manually and allow %2 install the latest file.</source>
-      <translation type="unfinished">Unable to verify that protocol file %1 is current. If file is out of date, you may experience problems. Safest approach is to delete the file manually and allow %2 install the latest file.</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCFlightGearLink.cc" line="879"/>
-      <source>FlightGear protocol file %1 is out of date. It will be deleted, which will cause %2 to install the latest version of the file.</source>
-      <translation type="unfinished">FlightGear protocol file %1 is out of date. It will be deleted, which will cause %2 to install the latest version of the file.</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCFlightGearLink.cc" line="881"/>
-      <source>Delete of protocol file failed. You will have to manually delete the file.</source>
-      <translation type="unfinished">Delete of protocol file failed. You will have to manually delete the file.</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCFlightGearLink.cc" line="890"/>
-      <source>FlightGear Failed to Start. %1 protocol (%2) not installed to FlightGear Protocol directory (%3)</source>
-      <translation type="unfinished">FlightGear Failed to Start. %1 protocol (%2) not installed to FlightGear Protocol directory (%3)</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCFlightGearLink.cc" line="894"/>
-      <source>Fix it for me</source>
-      <translation type="unfinished">Fix it for me</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCFlightGearLink.cc" line="910"/>
-      <source>Copy failed</source>
-      <translation type="unfinished">Copy failed</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCFlightGearLink.cc" line="912"/>
-      <source>Copy from (%1) to (%2) failed, possibly due to permissions issue. You will need to perform manually. Try pasting the following command into a Command Prompt which was started with Run as Administrator:
-
-</source>
-      <translation type="unfinished">Copy from (%1) to (%2) failed, possibly due to permissions issue. You will need to perform manually. Try pasting the following command into a Command Prompt which was started with Run as Administrator:
-
-</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCFlightGearLink.cc" line="914"/>
-      <source>Copy from (%1) to (%2) failed, possibly due to permissions issue. You will need to perform manually. Try pasting the following command into a shell:
-
-</source>
-      <translation type="unfinished">Copy from (%1) to (%2) failed, possibly due to permissions issue. You will need to perform manually. Try pasting the following command into a shell:
-
-</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCFlightGearLink.cc" line="919"/>
-      <source>Copy to Clipboard</source>
-      <translation type="unfinished">Copy to Clipboard</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCHilConfiguration</name>
-    <message>
-      <location filename="../src/ui/QGCHilConfiguration.ui" line="20"/>
-      <source>HIL Config</source>
-      <translation type="unfinished">HIL Config</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/QGCHilConfiguration.ui" line="26"/>
-      <source>Simulator</source>
-      <translation type="unfinished">Simulator</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/QGCHilConfiguration.ui" line="42"/>
-      <source>FlightGear 3.0+</source>
-      <translation type="unfinished">FlightGear 3.0+</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/QGCHilConfiguration.ui" line="47"/>
-      <source>X-Plane 10</source>
-      <translation type="unfinished">X-Plane 10</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/QGCHilConfiguration.ui" line="52"/>
-      <source>X-Plane 9</source>
-      <translation type="unfinished">X-Plane 9</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCHilFlightGearConfiguration</name>
-    <message>
-      <location filename="../src/ui/QGCHilFlightGearConfiguration.ui" line="20"/>
-      <source>Form</source>
-      <translation type="unfinished">Form</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/QGCHilFlightGearConfiguration.ui" line="51"/>
-      <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Additional Options:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Additional Options:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/QGCHilFlightGearConfiguration.ui" line="58"/>
-      <source>Airframe:</source>
-      <translation type="unfinished">Airframe:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/QGCHilFlightGearConfiguration.ui" line="84"/>
-      <source>Start</source>
-      <translation type="unfinished">Start</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/QGCHilFlightGearConfiguration.ui" line="91"/>
-      <source>Stop</source>
-      <translation type="unfinished">Stop</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/QGCHilFlightGearConfiguration.ui" line="98"/>
-      <source>Sensor HIL</source>
-      <translation type="unfinished">Sensor HIL</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/QGCHilFlightGearConfiguration.ui" line="108"/>
-      <source>Barometer Offset [kPa]:</source>
-      <translation type="unfinished">Barometer Offset [kPa]:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/QGCHilFlightGearConfiguration.ui" line="115"/>
-      <source>0</source>
-      <translation type="unfinished">0</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/QGCHilFlightGearConfiguration.cc" line="24"/>
-      <source>Reset to default options</source>
-      <translation type="unfinished">Reset to default options</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCHilJSBSimConfiguration</name>
-    <message>
-      <location filename="../src/ui/QGCHilJSBSimConfiguration.ui" line="20"/>
-      <source>Form</source>
-      <translation type="unfinished">Form</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/QGCHilJSBSimConfiguration.ui" line="38"/>
-      <source>Airframe:</source>
-      <translation type="unfinished">Airframe:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/QGCHilJSBSimConfiguration.ui" line="58"/>
-      <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Additional Options:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Additional Options:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/QGCHilJSBSimConfiguration.ui" line="71"/>
-      <source>--in-air --roll=0 --pitch=0 --vc=90 --heading=300 --timeofday=noon --disable-hud-3d --disable-fullscreen --geometry=400x300 --disable-anti-alias-hud --wind=0@0 --turbulence=0.0 --prop:/sim/frame-rate-throttle-hz=30 --control=mouse --disable-intro-music --disable-sound --disable-random-objects --disable-ai-models --shading-flat --fog-disable --disable-specular-highlight --disable-random-objects --disable-panel --disable-clouds --fdm=jsb --units-meters --prop:/engines/engine/running=true</source>
-      <translation type="unfinished">--in-air --roll=0 --pitch=0 --vc=90 --heading=300 --timeofday=noon --disable-hud-3d --disable-fullscreen --geometry=400x300 --disable-anti-alias-hud --wind=0@0 --turbulence=0.0 --prop:/sim/frame-rate-throttle-hz=30 --control=mouse --disable-intro-music --disable-sound --disable-random-objects --disable-ai-models --shading-flat --fog-disable --disable-specular-highlight --disable-random-objects --disable-panel --disable-clouds --fdm=jsb --units-meters --prop:/engines/engine/running=true</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/QGCHilJSBSimConfiguration.ui" line="84"/>
-      <source>Start</source>
-      <translation type="unfinished">Start</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/QGCHilJSBSimConfiguration.ui" line="91"/>
-      <source>Stop</source>
-      <translation type="unfinished">Stop</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCHilXPlaneConfiguration</name>
-    <message>
-      <location filename="../src/ui/QGCHilXPlaneConfiguration.ui" line="14"/>
-      <source>Form</source>
-      <translation type="unfinished">Form</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/QGCHilXPlaneConfiguration.ui" line="32"/>
-      <source>Start</source>
-      <translation type="unfinished">Start</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/QGCHilXPlaneConfiguration.ui" line="39"/>
-      <source>Host</source>
-      <translation type="unfinished">Host</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/QGCHilXPlaneConfiguration.ui" line="59"/>
-      <source>Enable sensor level HIL</source>
-      <translation type="unfinished">Enable sensor level HIL</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/QGCHilXPlaneConfiguration.ui" line="70"/>
-      <source>127.0.0.1:49000</source>
-      <translation type="unfinished">127.0.0.1:49000</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/QGCHilXPlaneConfiguration.ui" line="84"/>
-      <source>Use newer actuator format</source>
-      <translation type="unfinished">Use newer actuator format</translation>
+      <location filename="../src/api/QGCCorePlugin.cc" line="287"/>
+      <source>Video Stream</source>
+      <translation type="unfinished">Video Stream</translation>
     </message>
     <message>
-      <location filename="../src/ui/QGCHilXPlaneConfiguration.cc" line="24"/>
-      <location filename="../src/ui/QGCHilXPlaneConfiguration.cc" line="75"/>
-      <source>Connect</source>
-      <translation type="unfinished">Connect</translation>
+      <location filename="../src/api/QGCCorePlugin.cc" line="290"/>
+      <source>Health</source>
+      <translation type="unfinished">Health</translation>
     </message>
     <message>
-      <location filename="../src/ui/QGCHilXPlaneConfiguration.cc" line="70"/>
-      <source>Disconnect</source>
-      <translation type="unfinished">Disconnect</translation>
+      <location filename="../src/api/QGCCorePlugin.cc" line="291"/>
+      <source>Vibration</source>
+      <translation type="unfinished">Vibration</translation>
     </message>
-  </context>
-  <context>
-    <name>QGCJSBSimLink</name>
     <message>
-      <location filename="../src/comm/QGCJSBSimLink.cc" line="45"/>
-      <source>JSBSim Link (port:%1)</source>
-      <translation type="unfinished">JSBSim Link (port:%1)</translation>
+      <location filename="../src/api/QGCCorePlugin.cc" line="307"/>
+      <source>Log Download</source>
+      <translation type="unfinished">Log Download</translation>
     </message>
     <message>
-      <location filename="../src/comm/QGCJSBSimLink.cc" line="158"/>
-      <source>JSBSim Failed to start. Please check if the path and command is correct</source>
-      <translation type="unfinished">JSBSim Failed to start. Please check if the path and command is correct</translation>
+      <location filename="../src/api/QGCCorePlugin.cc" line="309"/>
+      <source>GeoTag Images</source>
+      <translation type="unfinished">GeoTag Images</translation>
     </message>
     <message>
-      <location filename="../src/comm/QGCJSBSimLink.cc" line="162"/>
-      <source>JSBSim crashed. This is a JSBSim-related problem, check for JSBSim upgrade.</source>
-      <translation type="unfinished">JSBSim crashed. This is a JSBSim-related problem, check for JSBSim upgrade.</translation>
+      <location filename="../src/api/QGCCorePlugin.cc" line="311"/>
+      <source>MAVLink Console</source>
+      <translation type="unfinished">MAVLink Console</translation>
     </message>
     <message>
-      <location filename="../src/comm/QGCJSBSimLink.cc" line="166"/>
-      <source>JSBSim start timed out. Please check if the path and command is correct</source>
-      <translation type="unfinished">JSBSim start timed out. Please check if the path and command is correct</translation>
+      <location filename="../src/api/QGCCorePlugin.cc" line="313"/>
+      <source>MAVLink Inspector</source>
+      <translation type="unfinished">MAVLink Inspector</translation>
     </message>
     <message>
-      <location filename="../src/comm/QGCJSBSimLink.cc" line="171"/>
-      <source>Could not communicate with JSBSim. Please check if the path and command are correct</source>
-      <translation type="unfinished">Could not communicate with JSBSim. Please check if the path and command are correct</translation>
+      <location filename="../src/api/QGCCorePlugin.cc" line="408"/>
+      <source>WARNING: You are about to enter Advanced Mode. If used incorrectly, this may cause your vehicle to malfunction thus voiding your warranty. You should do so only if instructed by customer support. Are you sure you want to enable Advanced Mode?</source>
+      <translation type="unfinished">WARNING: You are about to enter Advanced Mode. If used incorrectly, this may cause your vehicle to malfunction thus voiding your warranty. You should do so only if instructed by customer support. Are you sure you want to enable Advanced Mode?</translation>
     </message>
+  </context>
+  <context>
+    <name>QGCFenceCircle</name>
     <message>
-      <location filename="../src/comm/QGCJSBSimLink.cc" line="176"/>
-      <source>JSBSim error occurred. Please check if the path and command is correct.</source>
-      <translation type="unfinished">JSBSim error occurred. Please check if the path and command is correct.</translation>
+      <location filename="../src/MissionManager/QGCFenceCircle.cc" line="75"/>
+      <source>GeoFence Circle only supports version %1</source>
+      <translation type="unfinished">GeoFence Circle only supports version %1</translation>
     </message>
   </context>
   <context>
-    <name>QGCLogEntry</name>
+    <name>QGCFencePolygon</name>
     <message>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="95"/>
-      <source>Pending</source>
-      <translation type="unfinished">Pending</translation>
+      <location filename="../src/MissionManager/QGCFencePolygon.cc" line="68"/>
+      <source>GeoFence Polygon only supports version %1</source>
+      <translation type="unfinished">GeoFence Polygon only supports version %1</translation>
     </message>
   </context>
   <context>
-    <name>QGCMAVLinkLogPlayer</name>
+    <name>QGCFileDialog</name>
     <message>
-      <location filename="../src/ui/QGCMAVLinkLogPlayer.ui" line="14"/>
-      <source>Form</source>
-      <translation type="unfinished">Form</translation>
+      <location filename="../src/QmlControls/QGCFileDialog.qml" line="119"/>
+      <source>Path: %1</source>
+      <translation type="unfinished">Path: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/QGCMAVLinkLogPlayer.ui" line="39"/>
-      <location filename="../src/ui/QGCMAVLinkLogPlayer.ui" line="42"/>
-      <location filename="../src/ui/QGCMAVLinkLogPlayer.ui" line="45"/>
-      <source>Start to replay Flight Data</source>
-      <translation type="unfinished">Start to replay Flight Data</translation>
+      <location filename="../src/QmlControls/QGCFileDialog.qml" line="150"/>
+      <location filename="../src/QmlControls/QGCFileDialog.qml" line="263"/>
+      <source>Delete</source>
+      <translation type="unfinished">Delete</translation>
     </message>
     <message>
-      <location filename="../src/ui/QGCMAVLinkLogPlayer.ui" line="48"/>
-      <source>...</source>
-      <translation type="unfinished">...</translation>
+      <location filename="../src/QmlControls/QGCFileDialog.qml" line="161"/>
+      <source>No files</source>
+      <translation type="unfinished">No files</translation>
     </message>
     <message>
-      <location filename="../src/ui/QGCMAVLinkLogPlayer.ui" line="65"/>
-      <source>Time</source>
-      <translation type="unfinished">Time</translation>
+      <location filename="../src/QmlControls/QGCFileDialog.qml" line="202"/>
+      <source>New file name:</source>
+      <translation type="unfinished">New file name:</translation>
     </message>
     <message>
-      <location filename="../src/ui/QGCMAVLinkLogPlayer.ui" line="88"/>
-      <source>No Flight Data selected..</source>
-      <translation type="unfinished">No Flight Data selected..</translation>
+      <location filename="../src/QmlControls/QGCFileDialog.qml" line="215"/>
+      <source>File names must end with .%1 file extension. If missing it will be added.</source>
+      <translation type="unfinished">File names must end with .%1 file extension. If missing it will be added.</translation>
     </message>
     <message>
-      <location filename="../src/ui/QGCMAVLinkLogPlayer.ui" line="102"/>
-      <location filename="../src/ui/QGCMAVLinkLogPlayer.ui" line="105"/>
-      <location filename="../src/ui/QGCMAVLinkLogPlayer.ui" line="108"/>
-      <source>Select the Flight Data to replay</source>
-      <translation type="unfinished">Select the Flight Data to replay</translation>
+      <location filename="../src/QmlControls/QGCFileDialog.qml" line="223"/>
+      <source>The file %1 exists. Click Save again to replace it.</source>
+      <translation type="unfinished">The file %1 exists. Click Save again to replace it.</translation>
     </message>
     <message>
-      <location filename="../src/ui/QGCMAVLinkLogPlayer.ui" line="111"/>
-      <source>Replay Flight Data</source>
-      <translation type="unfinished">Replay Flight Data</translation>
+      <location filename="../src/QmlControls/QGCFileDialog.qml" line="231"/>
+      <source>Save to existing file:</source>
+      <translation type="unfinished">Save to existing file:</translation>
     </message>
+  </context>
+  <context>
+    <name>QGCFileDownload</name>
     <message>
-      <location filename="../src/ui/QGCMAVLinkLogPlayer.cc" line="71"/>
-      <source>Log Replay</source>
-      <translation type="unfinished">Log Replay</translation>
+      <location filename="../src/QGCFileDownload.cc" line="119"/>
+      <source>Could not save downloaded file to %1. Error: %2</source>
+      <translation type="unfinished">Could not save downloaded file to %1. Error: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/QGCMAVLinkLogPlayer.cc" line="71"/>
-      <source>You must close all connections prior to replaying a log.</source>
-      <translation type="unfinished">You must close all connections prior to replaying a log.</translation>
+      <location filename="../src/QGCFileDownload.cc" line="142"/>
+      <source>Download cancelled</source>
+      <translation type="unfinished">Download cancelled</translation>
+    </message>
+    <message>
+      <location filename="../src/QGCFileDownload.cc" line="145"/>
+      <source>Error: File Not Found</source>
+      <translation type="unfinished">Error: File Not Found</translation>
+    </message>
+    <message>
+      <location filename="../src/QGCFileDownload.cc" line="148"/>
+      <source>Error during download. Error: %1</source>
+      <translation type="unfinished">Error during download. Error: %1</translation>
     </message>
+  </context>
+  <context>
+    <name>QGCLogEntry</name>
     <message>
-      <location filename="../src/ui/QGCMAVLinkLogPlayer.cc" line="77"/>
-      <source>Load Telemetry Log File</source>
-      <translation type="unfinished">Load Telemetry Log File</translation>
+      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="95"/>
+      <source>Pending</source>
+      <translation type="unfinished">Pending</translation>
     </message>
+  </context>
+  <context>
+    <name>QGCMAVLinkVehicle</name>
     <message>
-      <location filename="../src/ui/QGCMAVLinkLogPlayer.cc" line="79"/>
-      <source>MAVLink Log Files (*.tlog);;All Files (*)</source>
-      <translation type="unfinished">MAVLink Log Files (*.tlog);;All Files (*)</translation>
+      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="578"/>
+      <source>All</source>
+      <translation type="unfinished">All</translation>
     </message>
   </context>
   <context>
     <name>QGCMapPolygonVisuals</name>
     <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="176"/>
+      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="220"/>
       <source>Select Polygon File</source>
       <translation type="unfinished">Select Polygon File</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="207"/>
+      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="248"/>
       <source>Remove vertex</source>
       <translation type="unfinished">Remove vertex</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="220"/>
-      <source>Circle</source>
-      <translation type="unfinished">Circle</translation>
+      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="50"/>
+      <source>Polygon Tools</source>
+      <translation type="unfinished">Polygon Tools</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="225"/>
-      <source>Polygon</source>
-      <translation type="unfinished">Polygon</translation>
+      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="51"/>
+      <source>Click in the map to add vertices. Click &apos;Done Tracing&apos; when finished.</source>
+      <translation type="unfinished">Click in the map to add vertices. Click &apos;Done Tracing&apos; when finished.</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="230"/>
+      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="261"/>
       <source>Set radius...</source>
       <translation type="unfinished">Set radius...</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="236"/>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="242"/>
+      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="267"/>
+      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="273"/>
       <source>Edit position...</source>
       <translation type="unfinished">Edit position...</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="238"/>
+      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="269"/>
       <source>Edit Center Position</source>
       <translation type="unfinished">Edit Center Position</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="244"/>
+      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="275"/>
       <source>Edit Vertex Position</source>
       <translation type="unfinished">Edit Vertex Position</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="248"/>
-      <source>Load KML/SHP...</source>
-      <translation type="unfinished">Load KML/SHP...</translation>
+      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="528"/>
+      <source>Basic</source>
+      <translation type="unfinished">Basic</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="509"/>
-      <source>Radius:</source>
-      <translation type="unfinished">Radius:</translation>
+      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="535"/>
+      <source>Circular</source>
+      <translation type="unfinished">Circular</translation>
+    </message>
+    <message>
+      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="542"/>
+      <source>Done Tracing</source>
+      <translation type="unfinished">Done Tracing</translation>
+    </message>
+    <message>
+      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="542"/>
+      <source>Trace</source>
+      <translation type="unfinished">Trace</translation>
+    </message>
+    <message>
+      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="560"/>
+      <source>Load KML/SHP...</source>
+      <translation type="unfinished">Load KML/SHP...</translation>
     </message>
   </context>
   <context>
     <name>QGCMapPolylineVisuals</name>
     <message>
-      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="118"/>
+      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="40"/>
+      <source>Polyline Tools</source>
+      <translation type="unfinished">Polyline Tools</translation>
+    </message>
+    <message>
+      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="41"/>
+      <source>Click in the map to add vertices. Click &apos;Done Tracing&apos; when finished.</source>
+      <translation type="unfinished">Click in the map to add vertices. Click &apos;Done Tracing&apos; when finished.</translation>
+    </message>
+    <message>
+      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="128"/>
       <source>Select KML File</source>
       <translation type="unfinished">Select KML File</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="141"/>
+      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="151"/>
       <source>Remove vertex</source>
       <translation type="unfinished">Remove vertex</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="150"/>
+      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="156"/>
       <source>Edit position...</source>
       <translation type="unfinished">Edit position...</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="151"/>
+      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="157"/>
       <source>Edit Position</source>
       <translation type="unfinished">Edit Position</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="155"/>
+      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="336"/>
+      <source>Basic</source>
+      <translation type="unfinished">Basic</translation>
+    </message>
+    <message>
+      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="343"/>
+      <source>Done Tracing</source>
+      <translation type="unfinished">Done Tracing</translation>
+    </message>
+    <message>
+      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="343"/>
+      <source>Trace</source>
+      <translation type="unfinished">Trace</translation>
+    </message>
+    <message>
+      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="360"/>
       <source>Load KML...</source>
       <translation type="unfinished">Load KML...</translation>
     </message>
@@ -12357,6 +13117,14 @@ sudo apt-get remove modemmanager</translation>
       <translation type="unfinished">Tuning IDs can be mapped to channels in the RC settings</translation>
     </message>
   </context>
+  <context>
+    <name>QGCOptionsComboBox</name>
+    <message>
+      <location filename="../src/QmlControls/QGCOptionsComboBox.qml" line="24"/>
+      <source>Options</source>
+      <translation type="unfinished">Options</translation>
+    </message>
+  </context>
   <context>
     <name>QGCPluginHost</name>
     <message>
@@ -12376,63 +13144,95 @@ sudo apt-get remove modemmanager</translation>
     </message>
   </context>
   <context>
-    <name>QGCTextField</name>
+    <name>QGCPopupDialogContainer</name>
     <message>
-      <location filename="../src/QmlControls/QGCTextField.qml" line="119"/>
-      <source>?</source>
-      <translation type="unfinished">?</translation>
+      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="97"/>
+      <source>Ok</source>
+      <translation type="unfinished">Ok</translation>
     </message>
-  </context>
-  <context>
-    <name>QGCUASFileView</name>
     <message>
-      <location filename="../src/ui/QGCUASFileView.ui" line="14"/>
-      <source>Form</source>
-      <translation type="unfinished">Form</translation>
+      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="100"/>
+      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="109"/>
+      <source>Open</source>
+      <translation type="unfinished">Open</translation>
+    </message>
+    <message>
+      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="103"/>
+      <source>Save</source>
+      <translation type="unfinished">Save</translation>
+    </message>
+    <message>
+      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="106"/>
+      <source>Apply</source>
+      <translation type="unfinished">Apply</translation>
+    </message>
+    <message>
+      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="112"/>
+      <source>Save All</source>
+      <translation type="unfinished">Save All</translation>
+    </message>
+    <message>
+      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="115"/>
+      <source>Yes</source>
+      <translation type="unfinished">Yes</translation>
+    </message>
+    <message>
+      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="118"/>
+      <source>Yes to All</source>
+      <translation type="unfinished">Yes to All</translation>
+    </message>
+    <message>
+      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="121"/>
+      <source>Retry</source>
+      <translation type="unfinished">Retry</translation>
+    </message>
+    <message>
+      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="124"/>
+      <source>Reset</source>
+      <translation type="unfinished">Reset</translation>
     </message>
     <message>
-      <location filename="../src/ui/QGCUASFileView.ui" line="20"/>
-      <source>List Files</source>
-      <translation type="unfinished">List Files</translation>
+      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="127"/>
+      <source>Restore to Defaults</source>
+      <translation type="unfinished">Restore to Defaults</translation>
     </message>
     <message>
-      <location filename="../src/ui/QGCUASFileView.ui" line="55"/>
-      <source>Download File</source>
-      <translation type="unfinished">Download File</translation>
+      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="130"/>
+      <source>Ignore</source>
+      <translation type="unfinished">Ignore</translation>
     </message>
     <message>
-      <location filename="../src/ui/QGCUASFileView.ui" line="78"/>
-      <location filename="../src/ui/QGCUASFileView.cc" line="114"/>
-      <source>Upload File</source>
-      <translation type="unfinished">Upload File</translation>
+      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="136"/>
+      <source>Cancel</source>
+      <translation type="unfinished">Cancel</translation>
     </message>
     <message>
-      <location filename="../src/ui/QGCUASFileView.cc" line="58"/>
-      <source>Download Directory</source>
-      <translation type="unfinished">Download Directory</translation>
+      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="139"/>
+      <source>Close</source>
+      <translation type="unfinished">Close</translation>
     </message>
     <message>
-      <location filename="../src/ui/QGCUASFileView.cc" line="84"/>
-      <source>Downloading: %1</source>
-      <translation type="unfinished">Downloading: %1</translation>
+      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="142"/>
+      <source>No</source>
+      <translation type="unfinished">No</translation>
     </message>
     <message>
-      <location filename="../src/ui/QGCUASFileView.cc" line="116"/>
-      <source>Uploading: %1</source>
-      <translation type="unfinished">Uploading: %1</translation>
+      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="145"/>
+      <source>No to All</source>
+      <translation type="unfinished">No to All</translation>
     </message>
     <message>
-      <location filename="../src/ui/QGCUASFileView.cc" line="139"/>
-      <source>Error: %1</source>
-      <translation type="unfinished">Error: %1</translation>
+      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="148"/>
+      <source>Abort</source>
+      <translation type="unfinished">Abort</translation>
     </message>
   </context>
   <context>
-    <name>QGCUASFileViewMulti</name>
+    <name>QGCTextField</name>
     <message>
-      <location filename="../src/ui/QGCUASFileViewMulti.ui" line="14"/>
-      <source>Onboard Files</source>
-      <translation type="unfinished">Onboard Files</translation>
+      <location filename="../src/QmlControls/QGCTextField.qml" line="119"/>
+      <source>?</source>
+      <translation type="unfinished">?</translation>
     </message>
   </context>
   <context>
@@ -12520,51 +13320,16 @@ sudo apt-get remove modemmanager</translation>
     </message>
   </context>
   <context>
-    <name>QGCXPlaneLink</name>
-    <message>
-      <location filename="../src/comm/QGCXPlaneLink.cc" line="64"/>
-      <source>X-Plane Link (localPort:%1)</source>
-      <translation type="unfinished">X-Plane Link (localPort:%1)</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCXPlaneLink.cc" line="187"/>
-      <source>Waiting for XPlane..</source>
-      <translation type="unfinished">Waiting for XPlane..</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCXPlaneLink.cc" line="282"/>
-      <source>X-Plane Failed to start. Please check if the path and command is correct</source>
-      <translation type="unfinished">X-Plane Failed to start. Please check if the path and command is correct</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCXPlaneLink.cc" line="286"/>
-      <source>X-Plane crashed. This is an X-Plane-related problem, check for X-Plane upgrade.</source>
-      <translation type="unfinished">X-Plane crashed. This is an X-Plane-related problem, check for X-Plane upgrade.</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCXPlaneLink.cc" line="290"/>
-      <source>X-Plane start timed out. Please check if the path and command is correct</source>
-      <translation type="unfinished">X-Plane start timed out. Please check if the path and command is correct</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCXPlaneLink.cc" line="295"/>
-      <source>Could not communicate with X-Plane. Please check if the path and command are correct</source>
-      <translation type="unfinished">Could not communicate with X-Plane. Please check if the path and command are correct</translation>
-    </message>
+    <name>QGroundControlQmlGlobal</name>
     <message>
-      <location filename="../src/comm/QGCXPlaneLink.cc" line="300"/>
-      <source>X-Plane error occurred. Please check if the path and command is correct.</source>
-      <translation type="unfinished">X-Plane error occurred. Please check if the path and command is correct.</translation>
+      <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="258"/>
+      <source>32 bit</source>
+      <translation type="unfinished">32 bit</translation>
     </message>
     <message>
-      <location filename="../src/comm/QGCXPlaneLink.cc" line="855"/>
-      <source>Receiving from XPlane at %1 Hz</source>
-      <translation type="unfinished">Receiving from XPlane at %1 Hz</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCXPlaneLink.cc" line="924"/>
-      <source>Receiving from XPlane.</source>
-      <translation type="unfinished">Receiving from XPlane.</translation>
+      <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="260"/>
+      <source>64 bit</source>
+      <translation type="unfinished">64 bit</translation>
     </message>
   </context>
   <context>
@@ -12629,7 +13394,7 @@ sudo apt-get remove modemmanager</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="26"/>
-      <location filename="../src/Vehicle/Vehicle.cc" line="55"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="59"/>
       <source>Guided mode not supported by Vehicle.</source>
       <translation type="unfinished">Guided mode not supported by Vehicle.</translation>
     </message>
@@ -12639,65 +13404,70 @@ sudo apt-get remove modemmanager</translation>
       <translation type="unfinished">Follow Me</translation>
     </message>
     <message>
-      <location filename="../src/JsonHelper.cc" line="41"/>
+      <location filename="../src/JsonHelper.cc" line="48"/>
       <source>The following required keys are missing: %1</source>
       <translation type="unfinished">The following required keys are missing: %1</translation>
     </message>
     <message>
-      <location filename="../src/JsonHelper.cc" line="55"/>
+      <location filename="../src/JsonHelper.cc" line="62"/>
       <source>value for coordinate is not array</source>
       <translation type="unfinished">value for coordinate is not array</translation>
     </message>
     <message>
-      <location filename="../src/JsonHelper.cc" line="62"/>
+      <location filename="../src/JsonHelper.cc" line="69"/>
       <source>Coordinate array must contain %1 values</source>
       <translation type="unfinished">Coordinate array must contain %1 values</translation>
     </message>
     <message>
-      <location filename="../src/JsonHelper.cc" line="68"/>
+      <location filename="../src/JsonHelper.cc" line="75"/>
       <source>Coordinate array may only contain double values, found: %1</source>
       <translation type="unfinished">Coordinate array may only contain double values, found: %1</translation>
     </message>
     <message>
-      <location filename="../src/JsonHelper.cc" line="146"/>
+      <location filename="../src/JsonHelper.cc" line="153"/>
       <source>Incorrect value type - key:type:expected %1:%2:%3</source>
       <translation type="unfinished">Incorrect value type - key:type:expected %1:%2:%3</translation>
     </message>
     <message>
-      <location filename="../src/JsonHelper.cc" line="186"/>
+      <location filename="../src/JsonHelper.cc" line="193"/>
       <source>enum strings/values count mismatch in %3 strings:values %1:%2</source>
       <translation type="unfinished">enum strings/values count mismatch in %3 strings:values %1:%2</translation>
     </message>
     <message>
-      <location filename="../src/JsonHelper.cc" line="240"/>
+      <location filename="../src/JsonHelper.cc" line="244"/>
       <source>Incorrect file type key expected:%1 actual:%2</source>
       <translation type="unfinished">Incorrect file type key expected:%1 actual:%2</translation>
     </message>
     <message>
       <location filename="../src/JsonHelper.cc" line="251"/>
-      <source>Incorrect type for version value, must be integer</source>
-      <translation type="unfinished">Incorrect type for version value, must be integer</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="257"/>
       <source>File version %1 is no longer supported</source>
       <translation type="unfinished">File version %1 is no longer supported</translation>
     </message>
     <message>
-      <location filename="../src/JsonHelper.cc" line="261"/>
+      <location filename="../src/JsonHelper.cc" line="255"/>
       <source>File version %1 is newer than current supported version %2</source>
       <translation type="unfinished">File version %1 is newer than current supported version %2</translation>
     </message>
     <message>
-      <location filename="../src/JsonHelper.cc" line="283"/>
+      <location filename="../src/JsonHelper.cc" line="414"/>
       <source>value for coordinate array is not array</source>
       <translation type="unfinished">value for coordinate array is not array</translation>
     </message>
     <message>
-      <location filename="../src/JsonHelper.cc" line="392"/>
+      <location filename="../src/JsonHelper.cc" line="523"/>
       <source>Unknown type: %1</source>
       <translation type="unfinished">Unknown type: %1</translation>
     </message>
+    <message>
+      <location filename="../src/main.cc" line="233"/>
+      <source>Error</source>
+      <translation type="unfinished">Error</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="234"/>
+      <source>A second instance of %1 is already running. Please close the other instance and try again.</source>
+      <translation type="unfinished">A second instance of %1 is already running. Please close the other instance and try again.</translation>
+    </message>
   </context>
   <context>
     <name>QmlTest</name>
@@ -12809,27 +13579,93 @@ sudo apt-get remove modemmanager</translation>
   <context>
     <name>RCRSSIIndicator</name>
     <message>
-      <location filename="../src/ui/toolbar/RCRSSIIndicator.qml" line="49"/>
+      <location filename="../src/ui/toolbar/RCRSSIIndicator.qml" line="51"/>
       <source>RC RSSI Status</source>
       <translation type="unfinished">RC RSSI Status</translation>
     </message>
     <message>
-      <location filename="../src/ui/toolbar/RCRSSIIndicator.qml" line="49"/>
+      <location filename="../src/ui/toolbar/RCRSSIIndicator.qml" line="51"/>
       <source>RC RSSI Data Unavailable</source>
       <translation type="unfinished">RC RSSI Data Unavailable</translation>
     </message>
     <message>
-      <location filename="../src/ui/toolbar/RCRSSIIndicator.qml" line="49"/>
+      <location filename="../src/ui/toolbar/RCRSSIIndicator.qml" line="51"/>
       <source>N/A</source>
       <comment>No data available</comment>
       <translation type="unfinished">N/A</translation>
     </message>
     <message>
-      <location filename="../src/ui/toolbar/RCRSSIIndicator.qml" line="62"/>
+      <location filename="../src/ui/toolbar/RCRSSIIndicator.qml" line="64"/>
       <source>RSSI:</source>
       <translation type="unfinished">RSSI:</translation>
     </message>
   </context>
+  <context>
+    <name>RCToParamDialog</name>
+    <message>
+      <location filename="../src/QmlControls/RCToParamDialog.qml" line="25"/>
+      <source>RC To Param</source>
+      <translation type="unfinished">RC To Param</translation>
+    </message>
+    <message>
+      <location filename="../src/QmlControls/RCToParamDialog.qml" line="44"/>
+      <source>Bind an RC Channel to a parameter value. Tuning IDs can be mapped to an RC Channel from Radio Setup page.</source>
+      <translation type="unfinished">Bind an RC Channel to a parameter value. Tuning IDs can be mapped to an RC Channel from Radio Setup page.</translation>
+    </message>
+    <message>
+      <location filename="../src/QmlControls/RCToParamDialog.qml" line="50"/>
+      <source>Waiting on parameter update from Vehicle.</source>
+      <translation type="unfinished">Waiting on parameter update from Vehicle.</translation>
+    </message>
+    <message>
+      <location filename="../src/QmlControls/RCToParamDialog.qml" line="61"/>
+      <source>Parameter</source>
+      <translation type="unfinished">Parameter</translation>
+    </message>
+    <message>
+      <location filename="../src/QmlControls/RCToParamDialog.qml" line="64"/>
+      <source>Tuning ID</source>
+      <translation type="unfinished">Tuning ID</translation>
+    </message>
+    <message>
+      <location filename="../src/QmlControls/RCToParamDialog.qml" line="72"/>
+      <source>Scale</source>
+      <translation type="unfinished">Scale</translation>
+    </message>
+    <message>
+      <location filename="../src/QmlControls/RCToParamDialog.qml" line="78"/>
+      <source>Center Value</source>
+      <translation type="unfinished">Center Value</translation>
+    </message>
+    <message>
+      <location filename="../src/QmlControls/RCToParamDialog.qml" line="84"/>
+      <source>Min Value</source>
+      <translation type="unfinished">Min Value</translation>
+    </message>
+    <message>
+      <location filename="../src/QmlControls/RCToParamDialog.qml" line="90"/>
+      <source>Max Value</source>
+      <translation type="unfinished">Max Value</translation>
+    </message>
+    <message>
+      <location filename="../src/QmlControls/RCToParamDialog.qml" line="101"/>
+      <source>Double check that all values are correct prior to confirming dialog.</source>
+      <translation type="unfinished">Double check that all values are correct prior to confirming dialog.</translation>
+    </message>
+  </context>
+  <context>
+    <name>ROIIndicator</name>
+    <message>
+      <location filename="../src/ui/toolbar/ROIIndicator.qml" line="51"/>
+      <source>ROI Disabled</source>
+      <translation type="unfinished">ROI Disabled</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/toolbar/ROIIndicator.qml" line="60"/>
+      <source>Disable ROI</source>
+      <translation type="unfinished">Disable ROI</translation>
+    </message>
+  </context>
   <context>
     <name>RadioComponent</name>
     <message>
@@ -12887,93 +13723,93 @@ sudo apt-get remove modemmanager</translation>
       <translation type="unfinished">%1 channels or more are needed to fly.</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="108"/>
+      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="110"/>
       <source>Click Ok to place your Spektrum receiver in the bind mode. Select the specific receiver type below:</source>
       <translation type="unfinished">Click Ok to place your Spektrum receiver in the bind mode. Select the specific receiver type below:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="112"/>
+      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="114"/>
       <source>DSM2 Mode</source>
       <translation type="unfinished">DSM2 Mode</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="117"/>
+      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="120"/>
       <source>DSMX (7 channels or less)</source>
       <translation type="unfinished">DSMX (7 channels or less)</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="123"/>
+      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="127"/>
       <source>DSMX (8 channels or more)</source>
       <translation type="unfinished">DSMX (8 channels or more)</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="178"/>
+      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="183"/>
       <source>Not Mapped</source>
       <translation type="unfinished">Not Mapped</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="204"/>
+      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="209"/>
       <source>Attitude Controls</source>
       <translation type="unfinished">Attitude Controls</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="212"/>
+      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="217"/>
       <source>Roll</source>
       <translation type="unfinished">Roll</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="242"/>
+      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="247"/>
       <source>Pitch</source>
       <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="272"/>
+      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="277"/>
       <source>Yaw</source>
       <translation type="unfinished">Yaw</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="302"/>
+      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="307"/>
       <source>Throttle</source>
       <translation type="unfinished">Throttle</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="331"/>
+      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="336"/>
       <source>Skip</source>
       <translation type="unfinished">Skip</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="337"/>
+      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="342"/>
       <source>Cancel</source>
       <translation type="unfinished">Cancel</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="344"/>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="347"/>
+      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="349"/>
+      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="352"/>
       <source>Calibrate</source>
       <translation type="unfinished">Calibrate</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="370"/>
+      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="375"/>
       <source>Additional Radio setup:</source>
       <translation type="unfinished">Additional Radio setup:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="407"/>
+      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="412"/>
       <source>Spektrum Bind</source>
       <translation type="unfinished">Spektrum Bind</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="412"/>
+      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="417"/>
       <source>Copy Trims</source>
       <translation type="unfinished">Copy Trims</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="436"/>
+      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="441"/>
       <source>Mode 1</source>
       <translation type="unfinished">Mode 1</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="442"/>
+      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="447"/>
       <source>Mode 2</source>
       <translation type="unfinished">Mode 2</translation>
     </message>
@@ -12981,7 +13817,7 @@ sudo apt-get remove modemmanager</translation>
   <context>
     <name>RadioComponentController</name>
     <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="121"/>
+      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="122"/>
       <source>Lower the Throttle stick all the way down as shown in diagram.
 
 It is recommended to disconnect all motors for additional safety, however, the system is designed to not arm during the calibration.
@@ -12994,7 +13830,7 @@ It is recommended to disconnect all motors for additional safety, however, the s
 Click Next to continue</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="124"/>
+      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="125"/>
       <source>Lower the Throttle stick all the way down as shown in diagram.
 Reset all transmitter trims to center.
 
@@ -13009,62 +13845,62 @@ Please ensure all motor power is disconnected AND all props are removed from the
 Click Next to continue</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="127"/>
+      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="128"/>
       <source>Move the Throttle stick all the way up and hold it there...</source>
       <translation type="unfinished">Move the Throttle stick all the way up and hold it there...</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="128"/>
+      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="129"/>
       <source>Move the Throttle stick all the way down and leave it there...</source>
       <translation type="unfinished">Move the Throttle stick all the way down and leave it there...</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="129"/>
+      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="130"/>
       <source>Move the Yaw stick all the way to the left and hold it there...</source>
       <translation type="unfinished">Move the Yaw stick all the way to the left and hold it there...</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="130"/>
+      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="131"/>
       <source>Move the Yaw stick all the way to the right and hold it there...</source>
       <translation type="unfinished">Move the Yaw stick all the way to the right and hold it there...</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="131"/>
+      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="132"/>
       <source>Move the Roll stick all the way to the left and hold it there...</source>
       <translation type="unfinished">Move the Roll stick all the way to the left and hold it there...</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="132"/>
+      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="133"/>
       <source>Move the Roll stick all the way to the right and hold it there...</source>
       <translation type="unfinished">Move the Roll stick all the way to the right and hold it there...</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="133"/>
+      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="134"/>
       <source>Move the Pitch stick all the way down and hold it there...</source>
       <translation type="unfinished">Move the Pitch stick all the way down and hold it there...</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="134"/>
+      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="135"/>
       <source>Move the Pitch stick all the way up and hold it there...</source>
       <translation type="unfinished">Move the Pitch stick all the way up and hold it there...</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="135"/>
+      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="136"/>
       <source>Allow the Pitch stick to move back to center...</source>
       <translation type="unfinished">Allow the Pitch stick to move back to center...</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="136"/>
+      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="137"/>
       <source>Move all the transmitter switches and/or dials back and forth to their extreme positions.</source>
       <translation type="unfinished">Move all the transmitter switches and/or dials back and forth to their extreme positions.</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="137"/>
+      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="138"/>
       <source>All settings have been captured. Click Next to write the new parameters to your board.</source>
       <translation type="unfinished">All settings have been captured. Click Next to write the new parameters to your board.</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="204"/>
+      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="205"/>
       <source>Center the Throttle stick as shown in diagram.
 Reset all transmitter trims to center.
 
@@ -13079,17 +13915,17 @@ Please ensure all motor power is disconnected from the vehicle.
 Click Next to continue</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="813"/>
+      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="814"/>
       <source>Next</source>
       <translation type="unfinished">Next</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="835"/>
+      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="836"/>
       <source>Calibrate</source>
       <translation type="unfinished">Calibrate</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="859"/>
+      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="860"/>
       <source>The current calibration settings are now displayed for each channel on screen.
 
 Click the Next button to upload calibration to board. Click Cancel if you don&apos;t want to save these values.</source>
@@ -13101,12 +13937,12 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
   <context>
     <name>RallyPointController</name>
     <message>
-      <location filename="../src/MissionManager/RallyPointController.cc" line="99"/>
+      <location filename="../src/MissionManager/RallyPointController.cc" line="102"/>
       <source>Rally: %1</source>
       <translation type="unfinished">Rally: %1</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/RallyPointController.cc" line="102"/>
+      <location filename="../src/MissionManager/RallyPointController.cc" line="105"/>
       <source>Rally Points supports version %1</source>
       <translation type="unfinished">Rally Points supports version %1</translation>
     </message>
@@ -13123,26 +13959,16 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
       <source>Rally Points provide alternate landing points when performing a Return to Launch (RTL).</source>
       <translation type="unfinished">Rally Points provide alternate landing points when performing a Return to Launch (RTL).</translation>
     </message>
-    <message>
-      <location filename="../src/PlanView/RallyPointEditorHeader.qml" line="62"/>
-      <source>Click in the map to add new rally points.</source>
-      <translation type="unfinished">Click in the map to add new rally points.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/RallyPointEditorHeader.qml" line="63"/>
-      <source>This vehicle does not support Rally Points.</source>
-      <translation type="unfinished">This vehicle does not support Rally Points.</translation>
-    </message>
   </context>
   <context>
     <name>RallyPointItemEditor</name>
     <message>
-      <location filename="../src/PlanView/RallyPointItemEditor.qml" line="49"/>
+      <location filename="../src/PlanView/RallyPointItemEditor.qml" line="51"/>
       <source>Rally Point</source>
       <translation type="unfinished">Rally Point</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/RallyPointItemEditor.qml" line="72"/>
+      <location filename="../src/PlanView/RallyPointItemEditor.qml" line="74"/>
       <source>Delete</source>
       <translation type="unfinished">Delete</translation>
     </message>
@@ -13150,12 +13976,80 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
   <context>
     <name>RallyPointMapVisuals</name>
     <message>
-      <location filename="../src/PlanView/RallyPointMapVisuals.qml" line="71"/>
+      <location filename="../src/PlanView/RallyPointMapVisuals.qml" line="72"/>
       <source>R</source>
       <comment>rally point map item label</comment>
       <translation type="unfinished">R</translation>
     </message>
   </context>
+  <context>
+    <name>RoverChecklist</name>
+    <message>
+      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="25"/>
+      <source>Rover Initial Checks</source>
+      <translation type="unfinished">Rover Initial Checks</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="28"/>
+      <source>Hardware</source>
+      <translation type="unfinished">Hardware</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="29"/>
+      <source>Battery mounted and secured?</source>
+      <translation type="unfinished">Battery mounted and secured?</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="50"/>
+      <source>Please arm the vehicle here</source>
+      <translation type="unfinished">Please arm the vehicle here</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="53"/>
+      <source>Mission</source>
+      <translation type="unfinished">Mission</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="54"/>
+      <source>Please confirm mission is valid (waypoints valid, no terrain collision).</source>
+      <translation type="unfinished">Please confirm mission is valid (waypoints valid, no terrain collision).</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="62"/>
+      <source>Last preparations before launch</source>
+      <translation type="unfinished">Last preparations before launch</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="66"/>
+      <source>Payload</source>
+      <translation type="unfinished">Payload</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="67"/>
+      <source>Configured and started? Payload lid closed?</source>
+      <translation type="unfinished">Configured and started? Payload lid closed?</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="71"/>
+      <source>Wind &amp; weather</source>
+      <translation type="unfinished">Wind &amp; weather</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="72"/>
+      <source>OK for your platform?</source>
+      <translation type="unfinished">OK for your platform?</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="76"/>
+      <source>Mission area</source>
+      <translation type="unfinished">Mission area</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="77"/>
+      <source>Mission area and path free of obstacles/people?</source>
+      <translation type="unfinished">Mission area and path free of obstacles/people?</translation>
+    </message>
+  </context>
   <context>
     <name>SHPFileHelper</name>
     <message>
@@ -13217,174 +14111,218 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
   <context>
     <name>SafetyComponent</name>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="130"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="130"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="67"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="67"/>
       <source>Low Battery Failsafe Trigger</source>
       <translation type="unfinished">Low Battery Failsafe Trigger</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="154"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="218"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="264"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="154"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="218"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="264"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="95"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="267"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="319"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="95"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="267"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="319"/>
       <source>Failsafe Action:</source>
       <translation type="unfinished">Failsafe Action:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="164"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="164"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="107"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="107"/>
       <source>Battery Warn Level:</source>
       <translation type="unfinished">Battery Warn Level:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="173"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="173"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="116"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="116"/>
       <source>Battery Failsafe Level:</source>
       <translation type="unfinished">Battery Failsafe Level:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="182"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="182"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="125"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="125"/>
       <source>Battery Emergency Level:</source>
       <translation type="unfinished">Battery Emergency Level:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="194"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="194"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="137"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="137"/>
+      <source>Object Detection</source>
+      <translation type="unfinished">Object Detection</translation>
+    </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="165"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="165"/>
+      <source>Collision Prevention:</source>
+      <translation type="unfinished">Collision Prevention:</translation>
+    </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="170"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="188"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="600"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="170"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="188"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="600"/>
+      <source>Disabled</source>
+      <translation type="unfinished">Disabled</translation>
+    </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="170"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="188"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="600"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="170"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="188"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="600"/>
+      <source>Enabled</source>
+      <translation type="unfinished">Enabled</translation>
+    </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="184"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="184"/>
+      <source>Obstacle Avoidance:</source>
+      <translation type="unfinished">Obstacle Avoidance:</translation>
+    </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="201"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="201"/>
+      <source>Minimum Distance: (</source>
+      <translation type="unfinished">Minimum Distance: (</translation>
+    </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="239"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="239"/>
       <source>RC Loss Failsafe Trigger</source>
       <translation type="unfinished">RC Loss Failsafe Trigger</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="228"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="228"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="279"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="279"/>
       <source>RC Loss Timeout:</source>
       <translation type="unfinished">RC Loss Timeout:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="240"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="240"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="291"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="291"/>
       <source>Data Link Loss Failsafe Trigger</source>
       <translation type="unfinished">Data Link Loss Failsafe Trigger</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="274"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="274"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="331"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="331"/>
       <source>Data Link Loss Timeout:</source>
       <translation type="unfinished">Data Link Loss Timeout:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="286"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="286"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="343"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="343"/>
       <source>Geofence Failsafe Trigger</source>
       <translation type="unfinished">Geofence Failsafe Trigger</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="310"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="310"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="372"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="372"/>
       <source>Action on breach:</source>
       <translation type="unfinished">Action on breach:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="321"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="321"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="385"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="385"/>
       <source>Max Radius:</source>
       <translation type="unfinished">Max Radius:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="334"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="334"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="398"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="398"/>
       <source>Max Altitude:</source>
       <translation type="unfinished">Max Altitude:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="349"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="349"/>
-      <source>Return Home Settings</source>
-      <translation type="unfinished">Return Home Settings</translation>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="413"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="413"/>
+      <source>Return To Launch Settings</source>
+      <translation type="unfinished">Return To Launch Settings</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="374"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="374"/>
-      <source>Climb to altitude of:</source>
-      <translation type="unfinished">Climb to altitude of:</translation>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="452"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="452"/>
+      <source>Return to launch, then:</source>
+      <translation type="unfinished">Return to launch, then:</translation>
+    </message>
+    <message>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="595"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="595"/>
+      <source>Telemetry logging to vehicle storage:</source>
+      <translation type="unfinished">Telemetry logging to vehicle storage:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="383"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="383"/>
-      <source>Return home, then:</source>
-      <translation type="unfinished">Return home, then:</translation>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="441"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="441"/>
+      <source>Climb to altitude of:</source>
+      <translation type="unfinished">Climb to altitude of:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="392"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="392"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="461"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="461"/>
       <source>Land immediately</source>
       <translation type="unfinished">Land immediately</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="402"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="402"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="471"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="471"/>
       <source>Loiter and do not land</source>
       <translation type="unfinished">Loiter and do not land</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="412"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="412"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="481"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="481"/>
       <source>Loiter and land after specified time</source>
       <translation type="unfinished">Loiter and land after specified time</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="418"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="418"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="487"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="487"/>
       <source>Loiter Time</source>
       <translation type="unfinished">Loiter Time</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="428"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="428"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="497"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="497"/>
       <source>Loiter Altitude</source>
       <translation type="unfinished">Loiter Altitude</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="441"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="441"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="510"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="510"/>
       <source>Land Mode Settings</source>
       <translation type="unfinished">Land Mode Settings</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="467"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="467"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="539"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="539"/>
       <source>Landing Descent Rate:</source>
       <translation type="unfinished">Landing Descent Rate:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="479"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="479"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="553"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="553"/>
       <source>Disarm After:</source>
       <translation type="unfinished">Disarm After:</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="494"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="494"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="568"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="568"/>
       <source>Vehicle Telemetry Logging</source>
       <translation type="unfinished">Vehicle Telemetry Logging</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="519"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="519"/>
-      <source>Enable telemetry logging to vehicle storage</source>
-      <translation type="unfinished">Enable telemetry logging to vehicle storage</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="537"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="537"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="618"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="618"/>
       <source>Hardware in the Loop Simulation</source>
       <translation type="unfinished">Hardware in the Loop Simulation</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="563"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="563"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="647"/>
+      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="647"/>
       <source>HITL Enabled:</source>
       <translation type="unfinished">HITL Enabled:</translation>
     </message>
@@ -13393,11 +14331,6 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
       <source>Safety</source>
       <translation type="unfinished">Safety</translation>
     </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.cc" line="30"/>
-      <source>Safety Setup is used to setup triggers for Return to Land as well as the settings for Return to Land itself.</source>
-      <translation type="unfinished">Safety Setup is used to setup triggers for Return to Land as well as the settings for Return to Land itself.</translation>
-    </message>
   </context>
   <context>
     <name>SafetyComponentSummary</name>
@@ -13882,7 +14815,7 @@ Click Ok to start calibration.</translation>
   <context>
     <name>SerialConfiguration</name>
     <message>
-      <location filename="../src/comm/SerialLink.h" line="93"/>
+      <location filename="../src/comm/SerialLink.h" line="94"/>
       <source>Serial Link Settings</source>
       <translation type="unfinished">Serial Link Settings</translation>
     </message>
@@ -13991,7 +14924,7 @@ Click Ok to start calibration.</translation>
       <translation type="unfinished">%1 Setup</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/Common/SetupPage.qml" line="67"/>
+      <location filename="../src/AutoPilotPlugins/Common/SetupPage.qml" line="66"/>
       <source>Advanced</source>
       <translation type="unfinished">Advanced</translation>
     </message>
@@ -14014,57 +14947,57 @@ Click Ok to start calibration.</translation>
       <translation type="unfinished">missing message panel text</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="84"/>
+      <location filename="../src/VehicleSetup/SetupView.qml" line="76"/>
       <source>%1 setup must be completed prior to %2 setup.</source>
       <translation type="unfinished">%1 setup must be completed prior to %2 setup.</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="130"/>
+      <location filename="../src/VehicleSetup/SetupView.qml" line="128"/>
       <source>%1 does not currently support setup of your vehicle type. </source>
       <translation type="unfinished">%1 does not currently support setup of your vehicle type. </translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="151"/>
+      <location filename="../src/VehicleSetup/SetupView.qml" line="146"/>
       <source>Vehicle settings and info will display after connecting your vehicle.</source>
       <translation type="unfinished">Vehicle settings and info will display after connecting your vehicle.</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="172"/>
+      <location filename="../src/VehicleSetup/SetupView.qml" line="167"/>
       <source>You are currently connected to a vehicle but it did not return the full parameter list. </source>
       <translation type="unfinished">You are currently connected to a vehicle but it did not return the full parameter list. </translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="173"/>
+      <location filename="../src/VehicleSetup/SetupView.qml" line="168"/>
       <source>As a result, the full set of vehicle setup options are not available.</source>
       <translation type="unfinished">As a result, the full set of vehicle setup options are not available.</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="214"/>
+      <location filename="../src/VehicleSetup/SetupView.qml" line="209"/>
       <source>Vehicle Setup</source>
       <translation type="unfinished">Vehicle Setup</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="240"/>
+      <location filename="../src/VehicleSetup/SetupView.qml" line="235"/>
       <source>Summary</source>
       <translation type="unfinished">Summary</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="252"/>
+      <location filename="../src/VehicleSetup/SetupView.qml" line="247"/>
       <source>Firmware</source>
       <translation type="unfinished">Firmware</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="263"/>
+      <location filename="../src/VehicleSetup/SetupView.qml" line="258"/>
       <source>PX4Flow</source>
       <translation type="unfinished">PX4Flow</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="275"/>
+      <location filename="../src/VehicleSetup/SetupView.qml" line="269"/>
       <source>Joystick</source>
       <translation type="unfinished">Joystick</translation>
     </message>
     <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="304"/>
+      <location filename="../src/VehicleSetup/SetupView.qml" line="296"/>
       <source>Parameters</source>
       <translation type="unfinished">Parameters</translation>
     </message>
@@ -14072,27 +15005,27 @@ Click Ok to start calibration.</translation>
   <context>
     <name>ShapeFileHelper</name>
     <message>
-      <location filename="../src/ShapeFileHelper.cc" line="18"/>
+      <location filename="../src/ShapeFileHelper.cc" line="17"/>
       <source>Shape file load failed. %1</source>
       <translation type="unfinished">Shape file load failed. %1</translation>
     </message>
     <message>
-      <location filename="../src/ShapeFileHelper.cc" line="41"/>
+      <location filename="../src/ShapeFileHelper.cc" line="40"/>
       <source>Unsupported file type. Only .%1 and .%2 are supported.</source>
       <translation type="unfinished">Unsupported file type. Only .%1 and .%2 are supported.</translation>
     </message>
     <message>
-      <location filename="../src/ShapeFileHelper.cc" line="94"/>
+      <location filename="../src/ShapeFileHelper.cc" line="93"/>
       <source>Polyline not support from SHP files.</source>
       <translation type="unfinished">Polyline not support from SHP files.</translation>
     </message>
     <message>
-      <location filename="../src/ShapeFileHelper.cc" line="103"/>
+      <location filename="../src/ShapeFileHelper.cc" line="102"/>
       <source>KML Files (*.%1)</source>
       <translation type="unfinished">KML Files (*.%1)</translation>
     </message>
     <message>
-      <location filename="../src/ShapeFileHelper.cc" line="108"/>
+      <location filename="../src/ShapeFileHelper.cc" line="107"/>
       <source>KML/SHP Files (*.%1 *.%2)</source>
       <translation type="unfinished">KML/SHP Files (*.%1 *.%2)</translation>
     </message>
@@ -14101,8 +15034,8 @@ Click Ok to start calibration.</translation>
     <name>SimpleItemEditor</name>
     <message>
       <location filename="../src/PlanView/SimpleItemEditor.qml" line="25"/>
-      <source>Altitude relative to home altitude</source>
-      <translation type="unfinished">Altitude relative to home altitude</translation>
+      <source>Altitude relative to launch altitude</source>
+      <translation type="unfinished">Altitude relative to launch altitude</translation>
     </message>
     <message>
       <location filename="../src/PlanView/SimpleItemEditor.qml" line="26"/>
@@ -14138,7 +15071,7 @@ Actual AMSL altitude: %1 %2</translation>
     </message>
     <message>
       <location filename="../src/PlanView/SimpleItemEditor.qml" line="41"/>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="168"/>
+      <location filename="../src/PlanView/SimpleItemEditor.qml" line="225"/>
       <source>Terrain Frame</source>
       <translation type="unfinished">Terrain Frame</translation>
     </message>
@@ -14153,22 +15086,72 @@ Actual AMSL altitude: %1 %2</translation>
       <translation type="unfinished">Provides advanced access to all commands/parameters. Be very careful!</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="145"/>
-      <source>Altitude Relative To Home</source>
-      <translation type="unfinished">Altitude Relative To Home</translation>
+      <location filename="../src/PlanView/SimpleItemEditor.qml" line="80"/>
+      <source>Move &apos;%1&apos; Takeoff to the %2 location.</source>
+      <translation type="unfinished">Move &apos;%1&apos; Takeoff to the %2 location.</translation>
+    </message>
+    <message>
+      <location filename="../src/PlanView/SimpleItemEditor.qml" line="80"/>
+      <source>V</source>
+      <translation type="unfinished">V</translation>
+    </message>
+    <message>
+      <location filename="../src/PlanView/SimpleItemEditor.qml" line="80"/>
+      <source>T</source>
+      <translation type="unfinished">T</translation>
+    </message>
+    <message>
+      <location filename="../src/PlanView/SimpleItemEditor.qml" line="80"/>
+      <source>desired</source>
+      <translation type="unfinished">desired</translation>
+    </message>
+    <message>
+      <location filename="../src/PlanView/SimpleItemEditor.qml" line="80"/>
+      <source>climbout</source>
+      <translation type="unfinished">climbout</translation>
+    </message>
+    <message>
+      <location filename="../src/PlanView/SimpleItemEditor.qml" line="87"/>
+      <source>Ensure clear of obstacles and into the wind.</source>
+      <translation type="unfinished">Ensure clear of obstacles and into the wind.</translation>
+    </message>
+    <message>
+      <location filename="../src/PlanView/SimpleItemEditor.qml" line="94"/>
+      <source>Done</source>
+      <translation type="unfinished">Done</translation>
+    </message>
+    <message>
+      <location filename="../src/PlanView/SimpleItemEditor.qml" line="107"/>
+      <source>Click in map to set planned Takeoff location.</source>
+      <translation type="unfinished">Click in map to set planned Takeoff location.</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="152"/>
+      <location filename="../src/PlanView/SimpleItemEditor.qml" line="108"/>
+      <source>Click in map to set planned Launch location.</source>
+      <translation type="unfinished">Click in map to set planned Launch location.</translation>
+    </message>
+    <message>
+      <location filename="../src/PlanView/SimpleItemEditor.qml" line="171"/>
+      <source>Altitude below specifies the approximate altitude of the ground. Normally 0 for landing back at original launch location.</source>
+      <translation type="unfinished">Altitude below specifies the approximate altitude of the ground. Normally 0 for landing back at original launch location.</translation>
+    </message>
+    <message>
+      <location filename="../src/PlanView/SimpleItemEditor.qml" line="202"/>
+      <source>Altitude Relative To Launch</source>
+      <translation type="unfinished">Altitude Relative To Launch</translation>
+    </message>
+    <message>
+      <location filename="../src/PlanView/SimpleItemEditor.qml" line="209"/>
       <source>Altitude Above Mean Sea Level</source>
       <translation type="unfinished">Altitude Above Mean Sea Level</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="160"/>
+      <location filename="../src/PlanView/SimpleItemEditor.qml" line="217"/>
       <source>Altitude Above Terrain</source>
       <translation type="unfinished">Altitude Above Terrain</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="222"/>
+      <location filename="../src/PlanView/SimpleItemEditor.qml" line="279"/>
       <source>Flight Speed</source>
       <translation type="unfinished">Flight Speed</translation>
     </message>
@@ -14176,37 +15159,37 @@ Actual AMSL altitude: %1 %2</translation>
   <context>
     <name>SimpleMissionItem</name>
     <message>
-      <location filename="../src/MissionManager/SimpleMissionItem.cc" line="411"/>
+      <location filename="../src/MissionManager/SimpleMissionItem.cc" line="382"/>
       <source>Unknown: %1</source>
       <translation type="unfinished">Unknown: %1</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/SimpleMissionItem.cc" line="418"/>
-      <source>H</source>
-      <translation type="unfinished">H</translation>
+      <location filename="../src/MissionManager/SimpleMissionItem.cc" line="389"/>
+      <source>L</source>
+      <translation type="unfinished">L</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/SimpleMissionItem.cc" line="422"/>
+      <location filename="../src/MissionManager/SimpleMissionItem.cc" line="393"/>
       <source>Takeoff</source>
       <translation type="unfinished">Takeoff</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/SimpleMissionItem.cc" line="424"/>
+      <location filename="../src/MissionManager/SimpleMissionItem.cc" line="395"/>
       <source>Land</source>
       <translation type="unfinished">Land</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/SimpleMissionItem.cc" line="426"/>
+      <location filename="../src/MissionManager/SimpleMissionItem.cc" line="397"/>
       <source>VTOL Takeoff</source>
       <translation type="unfinished">VTOL Takeoff</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/SimpleMissionItem.cc" line="428"/>
+      <location filename="../src/MissionManager/SimpleMissionItem.cc" line="399"/>
       <source>VTOL Land</source>
       <translation type="unfinished">VTOL Land</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/SimpleMissionItem.cc" line="430"/>
+      <location filename="../src/MissionManager/SimpleMissionItem.cc" line="402"/>
       <source>ROI</source>
       <translation type="unfinished">ROI</translation>
     </message>
@@ -14214,12 +15197,12 @@ Actual AMSL altitude: %1 %2</translation>
   <context>
     <name>StructureScanComplexItem</name>
     <message>
-      <location filename="../src/MissionManager/StructureScanComplexItem.cc" line="203"/>
+      <location filename="../src/MissionManager/StructureScanComplexItem.cc" line="238"/>
       <source>%1 does not support loading this complex mission item type: %2:%3</source>
       <translation type="unfinished">%1 does not support loading this complex mission item type: %2:%3</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/StructureScanComplexItem.cc" line="209"/>
+      <location filename="../src/MissionManager/StructureScanComplexItem.cc" line="244"/>
       <source>%1 version %2 not supported</source>
       <translation type="unfinished">%1 version %2 not supported</translation>
     </message>
@@ -14233,123 +15216,206 @@ Actual AMSL altitude: %1 %2</translation>
   <context>
     <name>StructureScanEditor</name>
     <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="63"/>
+      <location filename="../src/PlanView/StructureScanEditor.qml" line="69"/>
+      <source>Use the Polygon Tools to create the polygon which outlines the structure.</source>
+      <translation type="unfinished">Use the Polygon Tools to create the polygon which outlines the structure.</translation>
+    </message>
+    <message>
+      <location filename="../src/PlanView/StructureScanEditor.qml" line="100"/>
+      <source>Grid</source>
+      <translation type="unfinished">Grid</translation>
+    </message>
+    <message>
+      <location filename="../src/PlanView/StructureScanEditor.qml" line="101"/>
+      <source>Camera</source>
+      <translation type="unfinished">Camera</translation>
+    </message>
+    <message>
+      <location filename="../src/PlanView/StructureScanEditor.qml" line="113"/>
       <source>Note: Polygon respresents structure surface not vehicle flight path.</source>
       <translation type="unfinished">Note: Polygon respresents structure surface not vehicle flight path.</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="71"/>
+      <location filename="../src/PlanView/StructureScanEditor.qml" line="121"/>
       <source>WARNING: Photo interval is below minimum interval (%1 secs) supported by camera.</source>
       <translation type="unfinished">WARNING: Photo interval is below minimum interval (%1 secs) supported by camera.</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="80"/>
+      <location filename="../src/PlanView/StructureScanEditor.qml" line="130"/>
       <source>Scan Distance</source>
       <translation type="unfinished">Scan Distance</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="82"/>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="169"/>
+      <location filename="../src/PlanView/StructureScanEditor.qml" line="132"/>
+      <location filename="../src/PlanView/StructureScanEditor.qml" line="223"/>
       <source>Layer Height</source>
       <translation type="unfinished">Layer Height</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="83"/>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="184"/>
+      <location filename="../src/PlanView/StructureScanEditor.qml" line="133"/>
+      <location filename="../src/PlanView/StructureScanEditor.qml" line="238"/>
       <source>Trigger Distance</source>
       <translation type="unfinished">Trigger Distance</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="88"/>
+      <location filename="../src/PlanView/StructureScanEditor.qml" line="140"/>
       <source>Scan</source>
       <translation type="unfinished">Scan</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="107"/>
+      <location filename="../src/PlanView/StructureScanEditor.qml" line="159"/>
       <source>Start Scan From Bottom</source>
       <translation type="unfinished">Start Scan From Bottom</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="107"/>
+      <location filename="../src/PlanView/StructureScanEditor.qml" line="159"/>
       <source>Start Scan From Top</source>
       <translation type="unfinished">Start Scan From Top</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="113"/>
+      <location filename="../src/PlanView/StructureScanEditor.qml" line="165"/>
       <source>Structure Height</source>
       <translation type="unfinished">Structure Height</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="120"/>
+      <location filename="../src/PlanView/StructureScanEditor.qml" line="172"/>
       <source>Scan Bottom Alt</source>
       <translation type="unfinished">Scan Bottom Alt</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="127"/>
+      <location filename="../src/PlanView/StructureScanEditor.qml" line="179"/>
       <source>Entrance/Exit Alt</source>
       <translation type="unfinished">Entrance/Exit Alt</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="135"/>
+      <location filename="../src/PlanView/StructureScanEditor.qml" line="187"/>
       <source>Gimbal Pitch</source>
       <translation type="unfinished">Gimbal Pitch</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="151"/>
+      <location filename="../src/PlanView/StructureScanEditor.qml" line="203"/>
       <source>Rotate entry point</source>
       <translation type="unfinished">Rotate entry point</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="158"/>
+      <location filename="../src/PlanView/StructureScanEditor.qml" line="212"/>
       <source>Statistics</source>
       <translation type="unfinished">Statistics</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="166"/>
+      <location filename="../src/PlanView/StructureScanEditor.qml" line="220"/>
       <source>Layers</source>
       <translation type="unfinished">Layers</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="172"/>
+      <location filename="../src/PlanView/StructureScanEditor.qml" line="226"/>
       <source>Top Layer Alt</source>
       <translation type="unfinished">Top Layer Alt</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="175"/>
+      <location filename="../src/PlanView/StructureScanEditor.qml" line="229"/>
       <source>Bottom Layer Alt</source>
       <translation type="unfinished">Bottom Layer Alt</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="178"/>
+      <location filename="../src/PlanView/StructureScanEditor.qml" line="232"/>
       <source>Photo Count</source>
       <translation type="unfinished">Photo Count</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="181"/>
+      <location filename="../src/PlanView/StructureScanEditor.qml" line="235"/>
       <source>Photo Interval</source>
       <translation type="unfinished">Photo Interval</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="182"/>
+      <location filename="../src/PlanView/StructureScanEditor.qml" line="236"/>
       <source>secs</source>
       <translation type="unfinished">secs</translation>
     </message>
   </context>
+  <context>
+    <name>SubChecklist</name>
+    <message>
+      <location filename="../src/FlightDisplay/SubChecklist.qml" line="25"/>
+      <source>Submarine Initial checks</source>
+      <translation type="unfinished">Submarine Initial checks</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/SubChecklist.qml" line="28"/>
+      <source>Hardware</source>
+      <translation type="unfinished">Hardware</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/SubChecklist.qml" line="29"/>
+      <source>All seals in place?</source>
+      <translation type="unfinished">All seals in place?</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/SubChecklist.qml" line="50"/>
+      <source>Please arm the vehicle here</source>
+      <translation type="unfinished">Please arm the vehicle here</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/SubChecklist.qml" line="53"/>
+      <source>Actuators</source>
+      <translation type="unfinished">Actuators</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/SubChecklist.qml" line="54"/>
+      <source>Move all control surfaces. Did they work properly?</source>
+      <translation type="unfinished">Move all control surfaces. Did they work properly?</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/SubChecklist.qml" line="58"/>
+      <source>Motors</source>
+      <translation type="unfinished">Motors</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/SubChecklist.qml" line="59"/>
+      <source>Propellers free? Then throttle up gently. Working properly?</source>
+      <translation type="unfinished">Propellers free? Then throttle up gently. Working properly?</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/SubChecklist.qml" line="63"/>
+      <source>Mission</source>
+      <translation type="unfinished">Mission</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/SubChecklist.qml" line="64"/>
+      <source>Please confirm mission is valid (waypoints valid, no terrain collision).</source>
+      <translation type="unfinished">Please confirm mission is valid (waypoints valid, no terrain collision).</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/SubChecklist.qml" line="72"/>
+      <source>Last preparations before launch</source>
+      <translation type="unfinished">Last preparations before launch</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/SubChecklist.qml" line="76"/>
+      <source>Payload</source>
+      <translation type="unfinished">Payload</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/SubChecklist.qml" line="77"/>
+      <source>Configured and started? Payload lid closed?</source>
+      <translation type="unfinished">Configured and started? Payload lid closed?</translation>
+    </message>
+  </context>
   <context>
     <name>SurveyComplexItem</name>
     <message>
-      <location filename="../src/MissionManager/SurveyComplexItem.cc" line="160"/>
+      <location filename="../src/MissionManager/SurveyComplexItem.cc" line="169"/>
       <source>Survey items do not support version %1</source>
       <translation type="unfinished">Survey items do not support version %1</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/SurveyComplexItem.cc" line="217"/>
-      <location filename="../src/MissionManager/SurveyComplexItem.cc" line="273"/>
+      <location filename="../src/MissionManager/SurveyComplexItem.cc" line="226"/>
+      <location filename="../src/MissionManager/SurveyComplexItem.cc" line="282"/>
       <source>%1 does not support loading this complex mission item type: %2:%3</source>
       <translation type="unfinished">%1 does not support loading this complex mission item type: %2:%3</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/SurveyComplexItem.cc" line="321"/>
+      <location filename="../src/MissionManager/SurveyComplexItem.cc" line="330"/>
       <source>%1 but %2 object is missing</source>
       <translation type="unfinished">%1 but %2 object is missing</translation>
     </message>
@@ -14368,172 +15434,170 @@ Actual AMSL altitude: %1 %2</translation>
   <context>
     <name>SurveyItemEditor</name>
     <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="64"/>
+      <location filename="../src/PlanView/SurveyItemEditor.qml" line="210"/>
       <source>WARNING: Photo interval is below minimum interval (%1 secs) supported by camera.</source>
       <translation type="unfinished">WARNING: Photo interval is below minimum interval (%1 secs) supported by camera.</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="71"/>
+      <location filename="../src/PlanView/SurveyItemEditor.qml" line="198"/>
+      <location filename="../src/PlanView/SurveyItemEditor.qml" line="410"/>
       <source>Presets</source>
       <translation type="unfinished">Presets</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="94"/>
-      <source>Save Preset</source>
-      <translation type="unfinished">Save Preset</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="97"/>
-      <source>Delete Preset</source>
-      <translation type="unfinished">Delete Preset</translation>
+      <location filename="../src/PlanView/SurveyItemEditor.qml" line="32"/>
+      <source>Done</source>
+      <translation type="unfinished">Done</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="97"/>
-      <source>This preset cannot be deleted.</source>
-      <translation type="unfinished">This preset cannot be deleted.</translation>
+      <location filename="../src/PlanView/SurveyItemEditor.qml" line="77"/>
+      <source>Use the Polygon Tools to create the polygon which outlines your survey area.</source>
+      <translation type="unfinished">Use the Polygon Tools to create the polygon which outlines your survey area.</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="135"/>
-      <source>Custom (specify all settings)</source>
-      <translation type="unfinished">Custom (specify all settings)</translation>
+      <location filename="../src/PlanView/SurveyItemEditor.qml" line="196"/>
+      <source>Grid</source>
+      <translation type="unfinished">Grid</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="136"/>
-      <source>Save Settings As Preset</source>
-      <translation type="unfinished">Save Settings As Preset</translation>
+      <location filename="../src/PlanView/SurveyItemEditor.qml" line="197"/>
+      <source>Camera</source>
+      <translation type="unfinished">Camera</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="137"/>
-      <source>Delete Current Preset</source>
-      <translation type="unfinished">Delete Current Preset</translation>
+      <location filename="../src/PlanView/SurveyItemEditor.qml" line="457"/>
+      <source>Save Preset</source>
+      <translation type="unfinished">Save Preset</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="139"/>
-      <source>Presets:</source>
-      <translation type="unfinished">Presets:</translation>
+      <location filename="../src/PlanView/SurveyItemEditor.qml" line="432"/>
+      <location filename="../src/PlanView/SurveyItemEditor.qml" line="434"/>
+      <source>Delete Preset</source>
+      <translation type="unfinished">Delete Preset</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="164"/>
+      <location filename="../src/PlanView/SurveyItemEditor.qml" line="219"/>
       <source>Altitude</source>
       <translation type="unfinished">Altitude</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="166"/>
+      <location filename="../src/PlanView/SurveyItemEditor.qml" line="223"/>
       <source>Trigger Dist</source>
       <translation type="unfinished">Trigger Dist</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="167"/>
+      <location filename="../src/PlanView/SurveyItemEditor.qml" line="224"/>
       <source>Spacing</source>
       <translation type="unfinished">Spacing</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="174"/>
+      <location filename="../src/PlanView/SurveyItemEditor.qml" line="231"/>
+      <location filename="../src/PlanView/SurveyItemEditor.qml" line="463"/>
       <source>Transects</source>
       <translation type="unfinished">Transects</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="185"/>
+      <location filename="../src/PlanView/SurveyItemEditor.qml" line="242"/>
+      <location filename="../src/PlanView/SurveyItemEditor.qml" line="473"/>
       <source>Angle</source>
       <translation type="unfinished">Angle</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="207"/>
+      <location filename="../src/PlanView/SurveyItemEditor.qml" line="264"/>
       <source>Turnaround dist</source>
       <translation type="unfinished">Turnaround dist</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="218"/>
+      <location filename="../src/PlanView/SurveyItemEditor.qml" line="273"/>
+      <location filename="../src/PlanView/SurveyItemEditor.qml" line="497"/>
       <source>Rotate Entry Point</source>
       <translation type="unfinished">Rotate Entry Point</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="239"/>
+      <location filename="../src/PlanView/SurveyItemEditor.qml" line="288"/>
       <source>Hover and capture image</source>
       <translation type="unfinished">Hover and capture image</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="251"/>
+      <location filename="../src/PlanView/SurveyItemEditor.qml" line="294"/>
       <source>Refly at 90 deg offset</source>
       <translation type="unfinished">Refly at 90 deg offset</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="257"/>
+      <location filename="../src/PlanView/SurveyItemEditor.qml" line="300"/>
       <source>Images in turnarounds</source>
       <translation type="unfinished">Images in turnarounds</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="263"/>
+      <location filename="../src/PlanView/SurveyItemEditor.qml" line="306"/>
       <source>Fly alternate transects</source>
       <translation type="unfinished">Fly alternate transects</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="271"/>
+      <location filename="../src/PlanView/SurveyItemEditor.qml" line="312"/>
       <source>Relative altitude</source>
       <translation type="unfinished">Relative altitude</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="286"/>
+      <location filename="../src/PlanView/SurveyItemEditor.qml" line="332"/>
       <source>Terrain</source>
       <translation type="unfinished">Terrain</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="300"/>
+      <location filename="../src/PlanView/SurveyItemEditor.qml" line="345"/>
       <source>Vehicle follows terrain</source>
       <translation type="unfinished">Vehicle follows terrain</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="312"/>
+      <location filename="../src/PlanView/SurveyItemEditor.qml" line="357"/>
       <source>Tolerance</source>
       <translation type="unfinished">Tolerance</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="318"/>
+      <location filename="../src/PlanView/SurveyItemEditor.qml" line="363"/>
       <source>Max Climb Rate</source>
       <translation type="unfinished">Max Climb Rate</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="324"/>
+      <location filename="../src/PlanView/SurveyItemEditor.qml" line="369"/>
       <source>Max Descent Rate</source>
       <translation type="unfinished">Max Descent Rate</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="334"/>
+      <location filename="../src/PlanView/SurveyItemEditor.qml" line="381"/>
+      <location filename="../src/PlanView/SurveyItemEditor.qml" line="505"/>
       <source>Statistics</source>
       <translation type="unfinished">Statistics</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="358"/>
-      <source>Save the current settings as a named preset.</source>
-      <translation type="unfinished">Save the current settings as a named preset.</translation>
+      <location filename="../src/PlanView/SurveyItemEditor.qml" line="425"/>
+      <source>Apply Preset</source>
+      <translation type="unfinished">Apply Preset</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="363"/>
-      <source>Preset Name</source>
-      <translation type="unfinished">Preset Name</translation>
+      <location filename="../src/PlanView/SurveyItemEditor.qml" line="439"/>
+      <source>Are you sure you want to delete &apos;%1&apos; preset?</source>
+      <translation type="unfinished">Are you sure you want to delete &apos;%1&apos; preset?</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="373"/>
-      <source>Save Camera In Preset</source>
-      <translation type="unfinished">Save Camera In Preset</translation>
+      <location filename="../src/PlanView/SurveyItemEditor.qml" line="456"/>
+      <source>Save Settings As New Preset</source>
+      <translation type="unfinished">Save Settings As New Preset</translation>
     </message>
-  </context>
-  <context>
-    <name>SurveyMissionItem</name>
     <message>
-      <location filename="../src/MissionManager/SurveyMissionItem.cc" line="299"/>
-      <source>%1 does not support this version of survey items</source>
-      <translation type="unfinished">%1 does not support this version of survey items</translation>
+      <location filename="../src/PlanView/SurveyItemEditor.qml" line="533"/>
+      <source>Save the current settings as a named preset.</source>
+      <translation type="unfinished">Save the current settings as a named preset.</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/SurveyMissionItem.cc" line="331"/>
-      <source>%1 does not support loading this complex mission item type: %2:%3</source>
-      <translation type="unfinished">%1 does not support loading this complex mission item type: %2:%3</translation>
+      <location filename="../src/PlanView/SurveyItemEditor.qml" line="538"/>
+      <source>Preset Name</source>
+      <translation type="unfinished">Preset Name</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/SurveyMissionItem.cc" line="374"/>
-      <source>%1 but %2 object is missing</source>
-      <translation type="unfinished">%1 but %2 object is missing</translation>
+      <location filename="../src/PlanView/SurveyItemEditor.qml" line="552"/>
+      <source>Select Polygon File</source>
+      <translation type="unfinished">Select Polygon File</translation>
     </message>
   </context>
   <context>
@@ -14580,18 +15644,18 @@ Actual AMSL altitude: %1 %2</translation>
   <context>
     <name>TCPLink</name>
     <message>
-      <location filename="../src/comm/TCPLink.cc" line="165"/>
-      <location filename="../src/comm/TCPLink.cc" line="179"/>
+      <location filename="../src/comm/TCPLink.cc" line="166"/>
+      <location filename="../src/comm/TCPLink.cc" line="180"/>
       <source>Link Error</source>
       <translation type="unfinished">Link Error</translation>
     </message>
     <message>
-      <location filename="../src/comm/TCPLink.cc" line="165"/>
+      <location filename="../src/comm/TCPLink.cc" line="166"/>
       <source>Error on link %1. Connection failed</source>
       <translation type="unfinished">Error on link %1. Connection failed</translation>
     </message>
     <message>
-      <location filename="../src/comm/TCPLink.cc" line="179"/>
+      <location filename="../src/comm/TCPLink.cc" line="180"/>
       <source>Error on link %1. Error on socket: %2.</source>
       <translation type="unfinished">Error on link %1. Error on socket: %2.</translation>
     </message>
@@ -14823,6 +15887,14 @@ Confirm change?</source>
 Confirm change?</translation>
     </message>
   </context>
+  <context>
+    <name>TakeoffItemMapVisual</name>
+    <message>
+      <location filename="../src/PlanView/TakeoffItemMapVisual.qml" line="132"/>
+      <source>Launch</source>
+      <translation type="unfinished">Launch</translation>
+    </message>
+  </context>
   <context>
     <name>TcpSettings</name>
     <message>
@@ -14839,66 +15911,120 @@ Confirm change?</translation>
   <context>
     <name>TelemetryRSSIIndicator</name>
     <message>
-      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="46"/>
+      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="48"/>
       <source>Telemetry RSSI Status</source>
       <translation type="unfinished">Telemetry RSSI Status</translation>
     </message>
     <message>
-      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="56"/>
+      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="58"/>
       <source>Local RSSI:</source>
       <translation type="unfinished">Local RSSI:</translation>
     </message>
     <message>
-      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="58"/>
+      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="60"/>
       <source>Remote RSSI:</source>
       <translation type="unfinished">Remote RSSI:</translation>
     </message>
     <message>
-      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="60"/>
+      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="62"/>
       <source>RX Errors:</source>
       <translation type="unfinished">RX Errors:</translation>
     </message>
     <message>
-      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="62"/>
+      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="64"/>
       <source>Errors Fixed:</source>
       <translation type="unfinished">Errors Fixed:</translation>
     </message>
     <message>
-      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="64"/>
+      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="66"/>
       <source>TX Buffer:</source>
       <translation type="unfinished">TX Buffer:</translation>
     </message>
     <message>
-      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="66"/>
+      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="68"/>
       <source>Local Noise:</source>
       <translation type="unfinished">Local Noise:</translation>
     </message>
     <message>
-      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="68"/>
+      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="70"/>
       <source>Remote Noise:</source>
       <translation type="unfinished">Remote Noise:</translation>
     </message>
   </context>
+  <context>
+    <name>TerrainProgress</name>
+    <message>
+      <location filename="../src/FlightDisplay/TerrainProgress.qml" line="69"/>
+      <source>Terrain Load Progress</source>
+      <translation type="unfinished">Terrain Load Progress</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/TerrainProgress.qml" line="87"/>
+      <source>Done</source>
+      <translation type="unfinished">Done</translation>
+    </message>
+  </context>
+  <context>
+    <name>TerrainStatus</name>
+    <message>
+      <location filename="../src/PlanView/TerrainStatus.qml" line="51"/>
+      <source>Height AMSL (%1)</source>
+      <translation type="unfinished">Height AMSL (%1)</translation>
+    </message>
+  </context>
+  <context>
+    <name>ToolBarBase</name>
+    <message>
+      <location filename="../src/ui/toolbar/ToolBarBase.qml" line="184"/>
+      <source>Advanced Mode</source>
+      <translation type="unfinished">Advanced Mode</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/toolbar/ToolBarBase.qml" line="354"/>
+      <source>Downloading Parameters</source>
+      <translation type="unfinished">Downloading Parameters</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/toolbar/ToolBarBase.qml" line="362"/>
+      <source>Click anywhere to hide</source>
+      <translation type="unfinished">Click anywhere to hide</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/toolbar/ToolBarBase.qml" line="379"/>
+      <source>Waiting For Vehicle Connection</source>
+      <translation type="unfinished">Waiting For Vehicle Connection</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/toolbar/ToolBarBase.qml" line="401"/>
+      <source>Disconnect</source>
+      <translation type="unfinished">Disconnect</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/toolbar/ToolBarBase.qml" line="409"/>
+      <source>COMMUNICATION LOST</source>
+      <translation type="unfinished">COMMUNICATION LOST</translation>
+    </message>
+  </context>
   <context>
     <name>TransectStyleComplexItem</name>
     <message>
-      <location filename="../src/MissionManager/TransectStyleComplexItem.cc" line="205"/>
+      <location filename="../src/MissionManager/TransectStyleComplexItem.cc" line="211"/>
       <source>TransectStyleComplexItem version %2 not supported</source>
       <translation type="unfinished">TransectStyleComplexItem version %2 not supported</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/TransectStyleComplexItem.cc" line="501"/>
+      <location filename="../src/MissionManager/TransectStyleComplexItem.cc" line="633"/>
       <source>INTERNAL ERROR: TransectStyleComplexItem::_adjustTransectPointsForTerrain called when terrain data not ready. Plan will be incorrect.</source>
       <translation type="unfinished">INTERNAL ERROR: TransectStyleComplexItem::_adjustTransectPointsForTerrain called when terrain data not ready. Plan will be incorrect.</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/TransectStyleComplexItem.h" line="103"/>
-      <location filename="../src/MissionManager/TransectStyleComplexItem.h" line="104"/>
+      <location filename="../src/MissionManager/TransectStyleComplexItem.h" line="105"/>
+      <location filename="../src/MissionManager/TransectStyleComplexItem.h" line="106"/>
       <source>Transect</source>
       <translation type="unfinished">Transect</translation>
     </message>
     <message>
-      <location filename="../src/MissionManager/TransectStyleComplexItem.h" line="105"/>
+      <location filename="../src/MissionManager/TransectStyleComplexItem.h" line="107"/>
       <source>T</source>
       <translation type="unfinished">T</translation>
     </message>
@@ -14906,27 +16032,27 @@ Confirm change?</translation>
   <context>
     <name>TransectStyleComplexItemStats</name>
     <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemStats.qml" line="19"/>
+      <location filename="../src/PlanView/TransectStyleComplexItemStats.qml" line="16"/>
       <source>Survey Area</source>
       <translation type="unfinished">Survey Area</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemStats.qml" line="22"/>
+      <location filename="../src/PlanView/TransectStyleComplexItemStats.qml" line="19"/>
       <source>Photo Count</source>
       <translation type="unfinished">Photo Count</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemStats.qml" line="25"/>
+      <location filename="../src/PlanView/TransectStyleComplexItemStats.qml" line="22"/>
       <source>Photo Interval</source>
       <translation type="unfinished">Photo Interval</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemStats.qml" line="26"/>
+      <location filename="../src/PlanView/TransectStyleComplexItemStats.qml" line="23"/>
       <source>secs</source>
       <translation type="unfinished">secs</translation>
     </message>
     <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemStats.qml" line="28"/>
+      <location filename="../src/PlanView/TransectStyleComplexItemStats.qml" line="25"/>
       <source>Trigger Distance</source>
       <translation type="unfinished">Trigger Distance</translation>
     </message>
@@ -14934,92 +16060,92 @@ Confirm change?</translation>
   <context>
     <name>UAS</name>
     <message>
-      <location filename="../src/uas/UAS.cc" line="646"/>
+      <location filename="../src/uas/UAS.cc" line="621"/>
       <source>UNINIT</source>
       <translation type="unfinished">UNINIT</translation>
     </message>
     <message>
-      <location filename="../src/uas/UAS.cc" line="647"/>
+      <location filename="../src/uas/UAS.cc" line="622"/>
       <source>Unitialized, booting up.</source>
       <translation type="unfinished">Unitialized, booting up.</translation>
     </message>
     <message>
-      <location filename="../src/uas/UAS.cc" line="650"/>
+      <location filename="../src/uas/UAS.cc" line="625"/>
       <source>BOOT</source>
       <translation type="unfinished">BOOT</translation>
     </message>
     <message>
-      <location filename="../src/uas/UAS.cc" line="651"/>
+      <location filename="../src/uas/UAS.cc" line="626"/>
       <source>Booting system, please wait.</source>
       <translation type="unfinished">Booting system, please wait.</translation>
     </message>
     <message>
-      <location filename="../src/uas/UAS.cc" line="654"/>
+      <location filename="../src/uas/UAS.cc" line="629"/>
       <source>CALIBRATING</source>
       <translation type="unfinished">CALIBRATING</translation>
     </message>
     <message>
-      <location filename="../src/uas/UAS.cc" line="655"/>
+      <location filename="../src/uas/UAS.cc" line="630"/>
       <source>Calibrating sensors, please wait.</source>
       <translation type="unfinished">Calibrating sensors, please wait.</translation>
     </message>
     <message>
-      <location filename="../src/uas/UAS.cc" line="658"/>
+      <location filename="../src/uas/UAS.cc" line="633"/>
       <source>ACTIVE</source>
       <translation type="unfinished">ACTIVE</translation>
     </message>
     <message>
-      <location filename="../src/uas/UAS.cc" line="659"/>
+      <location filename="../src/uas/UAS.cc" line="634"/>
       <source>Active, normal operation.</source>
       <translation type="unfinished">Active, normal operation.</translation>
     </message>
     <message>
-      <location filename="../src/uas/UAS.cc" line="662"/>
+      <location filename="../src/uas/UAS.cc" line="637"/>
       <source>STANDBY</source>
       <translation type="unfinished">STANDBY</translation>
     </message>
     <message>
-      <location filename="../src/uas/UAS.cc" line="663"/>
+      <location filename="../src/uas/UAS.cc" line="638"/>
       <source>Standby mode, ready for launch.</source>
       <translation type="unfinished">Standby mode, ready for launch.</translation>
     </message>
     <message>
-      <location filename="../src/uas/UAS.cc" line="666"/>
+      <location filename="../src/uas/UAS.cc" line="641"/>
       <source>CRITICAL</source>
       <translation type="unfinished">CRITICAL</translation>
     </message>
     <message>
-      <location filename="../src/uas/UAS.cc" line="667"/>
+      <location filename="../src/uas/UAS.cc" line="642"/>
       <source>FAILURE: Continuing operation.</source>
       <translation type="unfinished">FAILURE: Continuing operation.</translation>
     </message>
     <message>
-      <location filename="../src/uas/UAS.cc" line="670"/>
+      <location filename="../src/uas/UAS.cc" line="645"/>
       <source>EMERGENCY</source>
       <translation type="unfinished">EMERGENCY</translation>
     </message>
     <message>
-      <location filename="../src/uas/UAS.cc" line="671"/>
+      <location filename="../src/uas/UAS.cc" line="646"/>
       <source>EMERGENCY: Land Immediately!</source>
       <translation type="unfinished">EMERGENCY: Land Immediately!</translation>
     </message>
     <message>
-      <location filename="../src/uas/UAS.cc" line="679"/>
+      <location filename="../src/uas/UAS.cc" line="654"/>
       <source>SHUTDOWN</source>
       <translation type="unfinished">SHUTDOWN</translation>
     </message>
     <message>
-      <location filename="../src/uas/UAS.cc" line="680"/>
+      <location filename="../src/uas/UAS.cc" line="655"/>
       <source>Powering off system.</source>
       <translation type="unfinished">Powering off system.</translation>
     </message>
     <message>
-      <location filename="../src/uas/UAS.cc" line="684"/>
+      <location filename="../src/uas/UAS.cc" line="659"/>
       <source>UNKNOWN</source>
       <translation type="unfinished">UNKNOWN</translation>
     </message>
     <message>
-      <location filename="../src/uas/UAS.cc" line="685"/>
+      <location filename="../src/uas/UAS.cc" line="660"/>
       <source>Unknown system state</source>
       <translation type="unfinished">Unknown system state</translation>
     </message>
@@ -15131,334 +16257,583 @@ Confirm change?</translation>
     </message>
   </context>
   <context>
-    <name>VTOLModeIndicator</name>
+    <name>UnitsFirstRunPrompt</name>
     <message>
-      <location filename="../src/ui/toolbar/VTOLModeIndicator.qml" line="26"/>
-      <source>VTOL: Fixed Wing</source>
-      <translation type="unfinished">VTOL: Fixed Wing</translation>
+      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="21"/>
+      <source>Measurement Units</source>
+      <translation type="unfinished">Measurement Units</translation>
     </message>
     <message>
-      <location filename="../src/ui/toolbar/VTOLModeIndicator.qml" line="26"/>
-      <source>VTOL: Multi-Rotor</source>
-      <translation type="unfinished">VTOL: Multi-Rotor</translation>
+      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="27"/>
+      <source>Horizontal Distance</source>
+      <translation type="unfinished">Horizontal Distance</translation>
+    </message>
+    <message>
+      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="27"/>
+      <source>Vertical Distance</source>
+      <translation type="unfinished">Vertical Distance</translation>
+    </message>
+    <message>
+      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="27"/>
+      <source>Area</source>
+      <translation type="unfinished">Area</translation>
+    </message>
+    <message>
+      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="27"/>
+      <source>Speed</source>
+      <translation type="unfinished">Speed</translation>
+    </message>
+    <message>
+      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="27"/>
+      <source>Temperature</source>
+      <translation type="unfinished">Temperature</translation>
+    </message>
+    <message>
+      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="64"/>
+      <source>Choose the measurement units you want to use. You can also change it later in General Settings.</source>
+      <translation type="unfinished">Choose the measurement units you want to use. You can also change it later in General Settings.</translation>
+    </message>
+    <message>
+      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="84"/>
+      <source>System of units</source>
+      <translation type="unfinished">System of units</translation>
+    </message>
+    <message>
+      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="97"/>
+      <source>Metric System</source>
+      <translation type="unfinished">Metric System</translation>
+    </message>
+    <message>
+      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="97"/>
+      <source>Imperial System</source>
+      <translation type="unfinished">Imperial System</translation>
     </message>
   </context>
   <context>
-    <name>ValuePageWidget</name>
+    <name>VTOLChecklist</name>
     <message>
-      <location filename="../src/FlightMap/Widgets/ValuePageWidget.qml" line="40"/>
-      <source>Value Widget Setup</source>
-      <translation type="unfinished">Value Widget Setup</translation>
+      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="25"/>
+      <source>VTOL Initial Checks</source>
+      <translation type="unfinished">VTOL Initial Checks</translation>
     </message>
     <message>
-      <location filename="../src/FlightMap/Widgets/ValuePageWidget.qml" line="168"/>
-      <source>Select the values you want to display:</source>
-      <translation type="unfinished">Select the values you want to display:</translation>
+      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="28"/>
+      <source>Hardware</source>
+      <translation type="unfinished">Hardware</translation>
     </message>
     <message>
-      <location filename="../src/FlightMap/Widgets/ValuePageWidget.qml" line="285"/>
-      <source>Large</source>
-      <translation type="unfinished">Large</translation>
+      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="29"/>
+      <source>Props mounted? Wings secured? Tail secured?</source>
+      <translation type="unfinished">Props mounted? Wings secured? Tail secured?</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="50"/>
+      <source>Please arm the vehicle here</source>
+      <translation type="unfinished">Please arm the vehicle here</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="53"/>
+      <source>Actuators</source>
+      <translation type="unfinished">Actuators</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="54"/>
+      <source>Move all control surfaces. Did they work properly?</source>
+      <translation type="unfinished">Move all control surfaces. Did they work properly?</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="58"/>
+      <source>Motors</source>
+      <translation type="unfinished">Motors</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="59"/>
+      <source>Propellers free? Then throttle up gently. Working properly?</source>
+      <translation type="unfinished">Propellers free? Then throttle up gently. Working properly?</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="63"/>
+      <source>Mission</source>
+      <translation type="unfinished">Mission</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="64"/>
+      <source>Please confirm mission is valid (waypoints valid, no terrain collision).</source>
+      <translation type="unfinished">Please confirm mission is valid (waypoints valid, no terrain collision).</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="72"/>
+      <source>Last preparations before launch</source>
+      <translation type="unfinished">Last preparations before launch</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="76"/>
+      <source>Payload</source>
+      <translation type="unfinished">Payload</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="77"/>
+      <source>Configured and started? Payload lid closed?</source>
+      <translation type="unfinished">Configured and started? Payload lid closed?</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="82"/>
+      <source>OK for your platform? Lauching into the wind?</source>
+      <translation type="unfinished">OK for your platform? Lauching into the wind?</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="86"/>
+      <source>Flight area</source>
+      <translation type="unfinished">Flight area</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="87"/>
+      <source>Launch area and path free of obstacles/people?</source>
+      <translation type="unfinished">Launch area and path free of obstacles/people?</translation>
+    </message>
+  </context>
+  <context>
+    <name>VTOLLandingComplexItem</name>
+    <message>
+      <location filename="../src/MissionManager/VTOLLandingComplexItem.cc" line="203"/>
+      <source>%1 does not support loading this complex mission item type: %2:%3</source>
+      <translation type="unfinished">%1 does not support loading this complex mission item type: %2:%3</translation>
+    </message>
+    <message>
+      <location filename="../src/MissionManager/VTOLLandingComplexItem.cc" line="223"/>
+      <source>%1 complex item version %2 not supported</source>
+      <translation type="unfinished">%1 complex item version %2 not supported</translation>
+    </message>
+  </context>
+  <context>
+    <name>VTOLLandingPatternEditor</name>
+    <message>
+      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="40"/>
+      <source>Set to vehicle heading</source>
+      <translation type="unfinished">Set to vehicle heading</translation>
+    </message>
+    <message>
+      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="41"/>
+      <source>Set to vehicle location</source>
+      <translation type="unfinished">Set to vehicle location</translation>
+    </message>
+    <message>
+      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="58"/>
+      <source>Loiter point</source>
+      <translation type="unfinished">Loiter point</translation>
+    </message>
+    <message>
+      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="74"/>
+      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="132"/>
+      <source>Altitude</source>
+      <translation type="unfinished">Altitude</translation>
+    </message>
+    <message>
+      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="82"/>
+      <source>Radius</source>
+      <translation type="unfinished">Radius</translation>
+    </message>
+    <message>
+      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="93"/>
+      <source>Loiter clockwise</source>
+      <translation type="unfinished">Loiter clockwise</translation>
+    </message>
+    <message>
+      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="109"/>
+      <source>Landing point</source>
+      <translation type="unfinished">Landing point</translation>
+    </message>
+    <message>
+      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="125"/>
+      <source>Heading</source>
+      <translation type="unfinished">Heading</translation>
+    </message>
+    <message>
+      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="140"/>
+      <source>Landing Dist</source>
+      <translation type="unfinished">Landing Dist</translation>
+    </message>
+    <message>
+      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="160"/>
+      <source>Altitudes relative to launch</source>
+      <translation type="unfinished">Altitudes relative to launch</translation>
+    </message>
+    <message>
+      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="170"/>
+      <source>Camera</source>
+      <translation type="unfinished">Camera</translation>
+    </message>
+    <message>
+      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="208"/>
+      <source>* Actual flight path will vary.</source>
+      <translation type="unfinished">* Actual flight path will vary.</translation>
+    </message>
+    <message>
+      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="217"/>
+      <source>* Avoid tailwind from loiter to land.</source>
+      <translation type="unfinished">* Avoid tailwind from loiter to land.</translation>
+    </message>
+    <message>
+      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="243"/>
+      <source>Click in map to set landing point.</source>
+      <translation type="unfinished">Click in map to set landing point.</translation>
+    </message>
+    <message>
+      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="250"/>
+      <source>- or -</source>
+      <translation type="unfinished">- or -</translation>
+    </message>
+    <message>
+      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="281"/>
+      <source>Drag the loiter point to adjust landing direction for wind and obstacles as well as distance to land point.</source>
+      <translation type="unfinished">Drag the loiter point to adjust landing direction for wind and obstacles as well as distance to land point.</translation>
+    </message>
+    <message>
+      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="285"/>
+      <source>Done</source>
+      <translation type="unfinished">Done</translation>
+    </message>
+  </context>
+  <context>
+    <name>VTOLLandingPatternMapVisual</name>
+    <message>
+      <location filename="../src/PlanView/VTOLLandingPatternMapVisual.qml" line="217"/>
+      <source>Loiter</source>
+      <translation type="unfinished">Loiter</translation>
+    </message>
+    <message>
+      <location filename="../src/PlanView/VTOLLandingPatternMapVisual.qml" line="238"/>
+      <source>Land</source>
+      <translation type="unfinished">Land</translation>
+    </message>
+  </context>
+  <context>
+    <name>VTOLModeIndicator</name>
+    <message>
+      <location filename="../src/ui/toolbar/VTOLModeIndicator.qml" line="24"/>
+      <source>VTOL: FW</source>
+      <translation type="unfinished">VTOL: FW</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/toolbar/VTOLModeIndicator.qml" line="24"/>
+      <source>VTOL: MR</source>
+      <translation type="unfinished">VTOL: MR</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/toolbar/VTOLModeIndicator.qml" line="25"/>
+      <source>VTOL: Fixed Wing</source>
+      <translation type="unfinished">VTOL: Fixed Wing</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/toolbar/VTOLModeIndicator.qml" line="25"/>
+      <source>VTOL: Multi-Rotor</source>
+      <translation type="unfinished">VTOL: Multi-Rotor</translation>
     </message>
   </context>
   <context>
     <name>Vehicle</name>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="601"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="630"/>
       <source>MAVLink Generic</source>
       <translation type="unfinished">MAVLink Generic</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="608"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="637"/>
       <source>Fixed Wing</source>
       <translation type="unfinished">Fixed Wing</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="610"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="639"/>
       <source>Multi-Rotor</source>
       <translation type="unfinished">Multi-Rotor</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="612"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="641"/>
       <source>VTOL</source>
       <translation type="unfinished">VTOL</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="614"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="643"/>
       <source>Rover</source>
       <translation type="unfinished">Rover</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="616"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="645"/>
       <source>Sub</source>
       <translation type="unfinished">Sub</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="618"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="647"/>
       <source>Unknown</source>
       <translation type="unfinished">Unknown</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="1550"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="982"/>
+      <source> ... </source>
+      <comment>Indicates missing chunk from chunked STATUS_TEXT</comment>
+      <translation type="unfinished"> ... </translation>
+    </message>
+    <message>
+      <location filename="../src/Vehicle/Vehicle.cc" line="1687"/>
       <source>%1 low battery: %2 percent remaining</source>
       <translation type="unfinished">%1 low battery: %2 percent remaining</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2056"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="2216"/>
       <source>switch to %2 as priority link</source>
       <translation type="unfinished">switch to %2 as priority link</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2535"/>
-      <source>Mission transfer failed. Retry transfer. Error: %1</source>
-      <translation type="unfinished">Mission transfer failed. Retry transfer. Error: %1</translation>
+      <location filename="../src/Vehicle/Vehicle.cc" line="2671"/>
+      <source>Mission transfer failed. Error: %1</source>
+      <translation type="unfinished">Mission transfer failed. Error: %1</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2541"/>
-      <source>GeoFence transfer failed. Retry transfer. Error: %1</source>
-      <translation type="unfinished">GeoFence transfer failed. Retry transfer. Error: %1</translation>
+      <location filename="../src/Vehicle/Vehicle.cc" line="2677"/>
+      <source>GeoFence transfer failed. Error: %1</source>
+      <translation type="unfinished">GeoFence transfer failed. Error: %1</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2547"/>
-      <source>Rally Point transfer failed. Retry transfer. Error: %1</source>
-      <translation type="unfinished">Rally Point transfer failed. Retry transfer. Error: %1</translation>
+      <location filename="../src/Vehicle/Vehicle.cc" line="2683"/>
+      <source>Rally Point transfer failed. Error: %1</source>
+      <translation type="unfinished">Rally Point transfer failed. Error: %1</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2605"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="2727"/>
       <source>AutoLoad%1.%2</source>
       <translation type="unfinished">AutoLoad%1.%2</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2810"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="2939"/>
       <source>%1 communication to auxiliary link %2 %3</source>
       <translation type="unfinished">%1 communication to auxiliary link %2 %3</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2817"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="2946"/>
       <source>Communication regained</source>
       <translation type="unfinished">Communication regained</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2819"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="2948"/>
       <source>Communication regained to vehicle %1 on %2 link %3</source>
       <translation type="unfinished">Communication regained to vehicle %1 on %2 link %3</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2819"/>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2827"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="2948"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="2956"/>
       <source>priority</source>
       <translation type="unfinished">priority</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2819"/>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2827"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="2948"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="2956"/>
       <source>auxiliary</source>
       <translation type="unfinished">auxiliary</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2821"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="2950"/>
       <source>Communication regained to vehicle %1</source>
       <translation type="unfinished">Communication regained to vehicle %1</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2825"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="2954"/>
       <source>Communication lost</source>
       <translation type="unfinished">Communication lost</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2827"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="2956"/>
       <source>Communication lost to vehicle %1 on %2 link %3</source>
       <translation type="unfinished">Communication lost to vehicle %1 on %2 link %3</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2829"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="2958"/>
       <source>Communication lost to vehicle %1</source>
       <translation type="unfinished">Communication lost to vehicle %1</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2833"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="2962"/>
       <source> to vehicle %1</source>
       <translation type="unfinished"> to vehicle %1</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2902"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="3031"/>
       <source>Generic micro air vehicle</source>
       <translation type="unfinished">Generic micro air vehicle</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2903"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="3032"/>
       <source>Fixed wing aircraft</source>
       <translation type="unfinished">Fixed wing aircraft</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2904"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="3033"/>
       <source>Quadrotor</source>
       <translation type="unfinished">Quadrotor</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2905"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="3034"/>
       <source>Coaxial helicopter</source>
       <translation type="unfinished">Coaxial helicopter</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2906"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="3035"/>
       <source>Normal helicopter with tail rotor.</source>
       <translation type="unfinished">Normal helicopter with tail rotor.</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2907"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="3036"/>
       <source>Ground installation</source>
       <translation type="unfinished">Ground installation</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2908"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="3037"/>
       <source>Operator control unit / ground control station</source>
       <translation type="unfinished">Operator control unit / ground control station</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2909"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="3038"/>
       <source>Airship, controlled</source>
       <translation type="unfinished">Airship, controlled</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2910"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="3039"/>
       <source>Free balloon, uncontrolled</source>
       <translation type="unfinished">Free balloon, uncontrolled</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2911"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="3040"/>
       <source>Rocket</source>
       <translation type="unfinished">Rocket</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2912"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="3041"/>
       <source>Ground rover</source>
       <translation type="unfinished">Ground rover</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2913"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="3042"/>
       <source>Surface vessel, boat, ship</source>
       <translation type="unfinished">Surface vessel, boat, ship</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2914"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="3043"/>
       <source>Submarine</source>
       <translation type="unfinished">Submarine</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2915"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="3044"/>
       <source>Hexarotor</source>
       <translation type="unfinished">Hexarotor</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2916"/>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2917"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="3045"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="3046"/>
       <source>Octorotor</source>
       <translation type="unfinished">Octorotor</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2918"/>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2919"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="3047"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="3048"/>
       <source>Flapping wing</source>
       <translation type="unfinished">Flapping wing</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2920"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="3049"/>
       <source>Onboard companion controller</source>
       <translation type="unfinished">Onboard companion controller</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2921"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="3050"/>
       <source>Two-rotor VTOL using control surfaces in vertical operation in addition. Tailsitter</source>
       <translation type="unfinished">Two-rotor VTOL using control surfaces in vertical operation in addition. Tailsitter</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2922"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="3051"/>
       <source>Quad-rotor VTOL using a V-shaped quad config in vertical operation. Tailsitter</source>
       <translation type="unfinished">Quad-rotor VTOL using a V-shaped quad config in vertical operation. Tailsitter</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2923"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="3052"/>
       <source>Tiltrotor VTOL</source>
       <translation type="unfinished">Tiltrotor VTOL</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2924"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="3053"/>
       <source>VTOL reserved 2</source>
       <translation type="unfinished">VTOL reserved 2</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2925"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="3054"/>
       <source>VTOL reserved 3</source>
       <translation type="unfinished">VTOL reserved 3</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2926"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="3055"/>
       <source>VTOL reserved 4</source>
       <translation type="unfinished">VTOL reserved 4</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2927"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="3056"/>
       <source>VTOL reserved 5</source>
       <translation type="unfinished">VTOL reserved 5</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2928"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="3057"/>
       <source>Onboard gimbal</source>
       <translation type="unfinished">Onboard gimbal</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2929"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="3058"/>
       <source>Onboard ADSB peripheral</source>
       <translation type="unfinished">Onboard ADSB peripheral</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2938"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="3067"/>
       <source>vehicle %1</source>
       <translation type="unfinished">vehicle %1</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2946"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="3075"/>
       <source>%1 %2 flight mode</source>
       <translation type="unfinished">%1 %2 flight mode</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2952"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="3081"/>
       <source>armed</source>
       <translation type="unfinished">armed</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2952"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="3081"/>
       <source>disarmed</source>
       <translation type="unfinished">disarmed</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="3221"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="3425"/>
       <source>Vehicle did not respond to command: %1</source>
       <translation type="unfinished">Vehicle did not respond to command: %1</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="3338"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="3577"/>
       <source>Bootloader flash succeeded</source>
       <translation type="unfinished">Bootloader flash succeeded</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="3355"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="3594"/>
       <source>%1 command temporarily rejected</source>
       <translation type="unfinished">%1 command temporarily rejected</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="3358"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="3597"/>
       <source>%1 command denied</source>
       <translation type="unfinished">%1 command denied</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="3361"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="3600"/>
       <source>%1 command not supported</source>
       <translation type="unfinished">%1 command not supported</translation>
     </message>
     <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="3364"/>
+      <location filename="../src/Vehicle/Vehicle.cc" line="3603"/>
       <source>%1 command failed</source>
       <translation type="unfinished">%1 command failed</translation>
     </message>
@@ -15502,6 +16877,34 @@ Confirm change?</translation>
       <translation type="unfinished">WARNING: Your vehicle requires setup prior to flight. Please resolve the items marked in red using the menu on the left.</translation>
     </message>
   </context>
+  <context>
+    <name>VehicleWarnings</name>
+    <message>
+      <location filename="../src/FlightDisplay/VehicleWarnings.qml" line="37"/>
+      <source>No GPS Lock for Vehicle</source>
+      <translation type="unfinished">No GPS Lock for Vehicle</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightDisplay/VehicleWarnings.qml" line="56"/>
+      <source>The vehicle has failed a pre-arm check. In order to arm the vehicle, resolve the failure.</source>
+      <translation type="unfinished">The vehicle has failed a pre-arm check. In order to arm the vehicle, resolve the failure.</translation>
+    </message>
+  </context>
+  <context>
+    <name>VerticalFactValueGrid</name>
+    <message>
+      <location filename="../src/QmlControls/VerticalFactValueGrid.qml" line="97"/>
+      <location filename="../src/QmlControls/VerticalFactValueGrid.qml" line="122"/>
+      <source>+</source>
+      <translation type="unfinished">+</translation>
+    </message>
+    <message>
+      <location filename="../src/QmlControls/VerticalFactValueGrid.qml" line="104"/>
+      <location filename="../src/QmlControls/VerticalFactValueGrid.qml" line="130"/>
+      <source>-</source>
+      <translation type="unfinished">-</translation>
+    </message>
+  </context>
   <context>
     <name>VibrationPageWidget</name>
     <message>
@@ -15536,51 +16939,61 @@ Confirm change?</translation>
     </message>
   </context>
   <context>
-    <name>VideoPageWidget</name>
+    <name>VideoManager</name>
+    <message>
+      <location filename="../src/VideoManager/VideoManager.cc" line="286"/>
+      <source>Video receiver is not ready.</source>
+      <translation type="unfinished">Video receiver is not ready.</translation>
+    </message>
+    <message>
+      <location filename="../src/VideoManager/VideoManager.cc" line="293"/>
+      <source>Invalid video format defined.</source>
+      <translation type="unfinished">Invalid video format defined.</translation>
+    </message>
     <message>
-      <location filename="../src/FlightMap/Widgets/VideoPageWidget.qml" line="56"/>
-      <source>Enable Stream</source>
-      <translation type="unfinished">Enable Stream</translation>
+      <location filename="../src/VideoManager/VideoManager.cc" line="304"/>
+      <source>Unabled to record video. Video save path must be specified in Settings.</source>
+      <translation type="unfinished">Unabled to record video. Video save path must be specified in Settings.</translation>
     </message>
+  </context>
+  <context>
+    <name>VideoPageWidget</name>
     <message>
-      <location filename="../src/FlightMap/Widgets/VideoPageWidget.qml" line="76"/>
+      <location filename="../src/FlightMap/Widgets/VideoPageWidget.qml" line="85"/>
       <source>Grid Lines</source>
       <translation type="unfinished">Grid Lines</translation>
     </message>
     <message>
-      <location filename="../src/FlightMap/Widgets/VideoPageWidget.qml" line="95"/>
-      <source>Video Screen Fit</source>
-      <translation type="unfinished">Video Screen Fit</translation>
+      <location filename="../src/FlightMap/Widgets/VideoPageWidget.qml" line="63"/>
+      <source>Enable</source>
+      <translation type="unfinished">Enable</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightMap/Widgets/VideoPageWidget.qml" line="104"/>
+      <source>Video Fit</source>
+      <translation type="unfinished">Video Fit</translation>
+    </message>
+    <message>
+      <location filename="../src/FlightMap/Widgets/VideoPageWidget.qml" line="115"/>
+      <source>File Name</source>
+      <translation type="unfinished">File Name</translation>
     </message>
     <message>
-      <location filename="../src/FlightMap/Widgets/VideoPageWidget.qml" line="105"/>
+      <location filename="../src/FlightMap/Widgets/VideoPageWidget.qml" line="126"/>
       <source>Stop Recording</source>
       <translation type="unfinished">Stop Recording</translation>
     </message>
     <message>
-      <location filename="../src/FlightMap/Widgets/VideoPageWidget.qml" line="105"/>
+      <location filename="../src/FlightMap/Widgets/VideoPageWidget.qml" line="126"/>
       <source>Record Stream</source>
       <translation type="unfinished">Record Stream</translation>
     </message>
     <message>
-      <location filename="../src/FlightMap/Widgets/VideoPageWidget.qml" line="156"/>
+      <location filename="../src/FlightMap/Widgets/VideoPageWidget.qml" line="177"/>
       <source>Video Streaming Not Configured</source>
       <translation type="unfinished">Video Streaming Not Configured</translation>
     </message>
   </context>
-  <context>
-    <name>VideoReceiver</name>
-    <message>
-      <location filename="../src/VideoStreaming/VideoReceiver.cc" line="675"/>
-      <source>Invalid video format defined.</source>
-      <translation type="unfinished">Invalid video format defined.</translation>
-    </message>
-    <message>
-      <location filename="../src/VideoStreaming/VideoReceiver.cc" line="698"/>
-      <source>Unabled to record video. Video save path must be specified in Settings.</source>
-      <translation type="unfinished">Unabled to record video. Video save path must be specified in Settings.</translation>
-    </message>
-  </context>
   <context>
     <name>ViewWidget</name>
     <message>
@@ -15594,53 +17007,4 @@ Confirm change?</translation>
       <translation type="unfinished">no vehicle connected</translation>
     </message>
   </context>
-  <context>
-    <name>linechart</name>
-    <message>
-      <location filename="../src/ui/linechart/Linechart.ui" line="26"/>
-      <source>Form</source>
-      <translation type="unfinished">Form</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/linechart/Linechart.ui" line="130"/>
-      <source>Filter... (Ctrl+F)</source>
-      <translation type="unfinished">Filter... (Ctrl+F)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/linechart/Linechart.ui" line="138"/>
-      <source>All MAVs</source>
-      <translation type="unfinished">All MAVs</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/linechart/Linechart.ui" line="156"/>
-      <source>Display only variable names in curve list</source>
-      <translation type="unfinished">Display only variable names in curve list</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/linechart/Linechart.ui" line="159"/>
-      <source>Short names</source>
-      <translation type="unfinished">Short names</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/linechart/Linechart.ui" line="166"/>
-      <location filename="../src/ui/linechart/Linechart.ui" line="169"/>
-      <source>Display variable units in curve list</source>
-      <translation type="unfinished">Display variable units in curve list</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/linechart/Linechart.ui" line="172"/>
-      <source>Show units</source>
-      <translation type="unfinished">Show units</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/linechart/Linechart.ui" line="208"/>
-      <source>Rotate color scheme for all curves</source>
-      <translation type="unfinished">Rotate color scheme for all curves</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/linechart/Linechart.ui" line="211"/>
-      <source>Recolor</source>
-      <translation type="unfinished">Recolor</translation>
-    </message>
-  </context>
 </TS>
-- 
GitLab