diff --git a/translations/README.md b/translations/README.md
index cf14a555f1f467ac82962e1e453e77b04fd7b859..40ec8b1845c4b43049f0168d73472e4b734df36d 100644
--- a/translations/README.md
+++ b/translations/README.md
@@ -2,6 +2,8 @@
 
 QGC uses the standard Qt Linguist mechanisms for string translation. QGC uses crowd sourced string translation through a [Crowdin project](https://crowdin.com/project/qgroundcontrol for translation).
 
+## `source qgc-lupdate.sh`
+Run this command to update the translations files for both Qt and Json. Crowdin will automatically pull these up and submit a pull request back when new translations are available.
 
 ## C++ and Qml code strings
 These are coded using the standard Qt tr() for C++ and qsTr() for Qml mechanisms.
diff --git a/translations/qgc-json.ts b/translations/qgc-json.ts
new file mode 100644
index 0000000000000000000000000000000000000000..02565bfa3d31e2bec7dda652320b140dd9c60f84
--- /dev/null
+++ b/translations/qgc-json.ts
@@ -0,0 +1,3985 @@
+<context>
+    <name>SubmarineFact.json</name>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[lights2].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/SubmarineFact.json"/>
+        <source>Lights 2 level</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[inputHold].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/SubmarineFact.json"/>
+        <source>Input Hold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[rollPitchToggle].enumStrings, </extracomment>
+        <location filename="../src/Vehicle/SubmarineFact.json"/>
+        <source>Disabled,Enabled,Unavailable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[lights1].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/SubmarineFact.json"/>
+        <source>Lights 1 level</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[tetherTurns].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/SubmarineFact.json"/>
+        <source>Tether Turns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[inputHold].enumStrings, </extracomment>
+        <location filename="../src/Vehicle/SubmarineFact.json"/>
+        <source>Disabled,Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[cameraTilt].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/SubmarineFact.json"/>
+        <source>Camera Tilt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[rangefinderDistance].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/SubmarineFact.json"/>
+        <source>Rangefinder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[pilotGain].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/SubmarineFact.json"/>
+        <source>Pilot Gain</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[rollPitchToggle].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/SubmarineFact.json"/>
+        <source>Roll/Pitch Toggle</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SetpointFact.json</name>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[pitchRate].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/SetpointFact.json"/>
+        <source>Pitch Rate Setpoint</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[pitch].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/SetpointFact.json"/>
+        <source>Pitch Setpoint</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[yaw].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/SetpointFact.json"/>
+        <source>Yaw Setpoint</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[yawRate].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/SetpointFact.json"/>
+        <source>Yaw Rate Setpoint</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[roll].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/SetpointFact.json"/>
+        <source>Roll Setpoint</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[rollRate].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/SetpointFact.json"/>
+        <source>Roll Rate Setpoint</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EstimatorStatusFactGroup.json</name>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[accelError].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/EstimatorStatusFactGroup.json"/>
+        <source>Accel Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[haglRatio].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/EstimatorStatusFactGroup.json"/>
+        <source>HAGL Ratio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[vertPosAccuracy].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/EstimatorStatusFactGroup.json"/>
+        <source>Vert Pos Accuracy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[horizPosAccuracy].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/EstimatorStatusFactGroup.json"/>
+        <source>Horiz Pos Accuracy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[goodConstPosModeEstimate].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/EstimatorStatusFactGroup.json"/>
+        <source>Good Const Pos Mode Estimate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[goodPredHorizPosAbsEstimate].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/EstimatorStatusFactGroup.json"/>
+        <source>Good Pred Horiz Pos Abs Estimate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[goodAttitudeEsimate].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/EstimatorStatusFactGroup.json"/>
+        <source>Good Attitude Esimate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[goodHorizVelEstimate].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/EstimatorStatusFactGroup.json"/>
+        <source>Good Horiz Vel Estimate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[goodVertPosAbsEstimate].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/EstimatorStatusFactGroup.json"/>
+        <source>Good Vert Pos Abs Estimate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[horizPosRatio].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/EstimatorStatusFactGroup.json"/>
+        <source>Horiz Pos Ratio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[velRatio].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/EstimatorStatusFactGroup.json"/>
+        <source>Vel Ratio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[goodVertPosAGLEstimate].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/EstimatorStatusFactGroup.json"/>
+        <source>Good Vert Pos AGL Estimate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[goodHorizPosRelEstimate].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/EstimatorStatusFactGroup.json"/>
+        <source>Good Horiz Pos Rel Estimate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[magRatio].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/EstimatorStatusFactGroup.json"/>
+        <source>Mag Ratio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[tasRatio].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/EstimatorStatusFactGroup.json"/>
+        <source>TAS Ratio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[vertPosRatio].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/EstimatorStatusFactGroup.json"/>
+        <source>Vert Pos Ratio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[gpsGlitch].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/EstimatorStatusFactGroup.json"/>
+        <source>Gps Glitch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[goodVertVelEstimate].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/EstimatorStatusFactGroup.json"/>
+        <source>Good Vert Vel Estimate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[goodHorizPosAbsEstimate].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/EstimatorStatusFactGroup.json"/>
+        <source>Good Horiz Pos Abs Estimate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[goodPredHorizPosRelEstimate].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/EstimatorStatusFactGroup.json"/>
+        <source>Good Pred Horiz Pos Rel Estimate</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VehicleFact.json</name>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[headingToNextWP].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/VehicleFact.json"/>
+        <source>Next WP Heading</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[missionItemIndex].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/VehicleFact.json"/>
+        <source>Mission Item Index</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[altitudeRelative].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/VehicleFact.json"/>
+        <source>Alt (Rel)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[throttlePct].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/VehicleFact.json"/>
+        <source>Throttle %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[airSpeed].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/VehicleFact.json"/>
+        <source>Air Speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[altitudeAMSL].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/VehicleFact.json"/>
+        <source>Alt (AMSL)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[hobbs].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/VehicleFact.json"/>
+        <source>Hobbs Meter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[groundSpeed].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/VehicleFact.json"/>
+        <source>Ground Speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[yawRate].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/VehicleFact.json"/>
+        <source>Yaw Rate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[distanceToHome].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/VehicleFact.json"/>
+        <source>Distance to Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[heading].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/VehicleFact.json"/>
+        <source>Heading</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[headingToHome].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/VehicleFact.json"/>
+        <source>Heading to Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[climbRate].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/VehicleFact.json"/>
+        <source>Climb Rate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[pitch].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/VehicleFact.json"/>
+        <source>Pitch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[rollRate].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/VehicleFact.json"/>
+        <source>Roll Rate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[flightTime].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/VehicleFact.json"/>
+        <source>Flight Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[pitchRate].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/VehicleFact.json"/>
+        <source>Pitch Rate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[flightDistance].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/VehicleFact.json"/>
+        <source>Flight Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[roll].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/VehicleFact.json"/>
+        <source>Roll</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[distanceToGCS].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/VehicleFact.json"/>
+        <source>Distance to GCS</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TemperatureFact.json</name>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[temperature3].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/TemperatureFact.json"/>
+        <source>Temperature (3)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[temperature2].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/TemperatureFact.json"/>
+        <source>Temperature (2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[temperature1].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/TemperatureFact.json"/>
+        <source>Temperature (1)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WindFact.json</name>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[verticalSpeed].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/WindFact.json"/>
+        <source>Wind Spd (vert)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[direction].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/WindFact.json"/>
+        <source>Wind Direction</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[speed].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/WindFact.json"/>
+        <source>Wind Spd</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GPSFact.json</name>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[lock].enumStrings, </extracomment>
+        <location filename="../src/Vehicle/GPSFact.json"/>
+        <source>None,None,2D Lock,3D Lock,3D DGPS Lock,3D RTK GPS Lock (float),3D RTK GPS Lock (fixed),Static (fixed)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[vdop].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/GPSFact.json"/>
+        <source>VDOP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[hdop].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/GPSFact.json"/>
+        <source>HDOP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[count].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/GPSFact.json"/>
+        <source>Sat Count</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[mgrs].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/GPSFact.json"/>
+        <source>MGRS Position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[lon].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/GPSFact.json"/>
+        <source>Longitude</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[courseOverGround].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/GPSFact.json"/>
+        <source>Course Over Ground</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[lat].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/GPSFact.json"/>
+        <source>Latitude</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[lock].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/GPSFact.json"/>
+        <source>GPS Lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ClockFact.json</name>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[currentDate].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/ClockFact.json"/>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[currentTime].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/ClockFact.json"/>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VibrationFact.json</name>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[clipCount3].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/VibrationFact.json"/>
+        <source>Clip Count (3)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[clipCount1].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/VibrationFact.json"/>
+        <source>Clip Count (1)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[yAxis].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/VibrationFact.json"/>
+        <source>Vibe yAxis</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[xAxis].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/VibrationFact.json"/>
+        <source>Vibe xAxis</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[clipCount2].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/VibrationFact.json"/>
+        <source>Clip Count (2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[zAxis].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/VibrationFact.json"/>
+        <source>Vibe zAxis</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GPSRTKFact.json</name>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[active].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/GPSRTKFact.json"/>
+        <source>Survey-In Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[currentAccuracy].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/GPSRTKFact.json"/>
+        <source>Current Survey-In Accuracy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[currentAltitude].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/GPSRTKFact.json"/>
+        <source>Current Survey-In Altitude</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[valid].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/GPSRTKFact.json"/>
+        <source>Survey-In Valid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[currentLongitude].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/GPSRTKFact.json"/>
+        <source>Current Survey-In Longitude</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[connected].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/GPSRTKFact.json"/>
+        <source>Connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[currentDuration].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/GPSRTKFact.json"/>
+        <source>Current Survey-In Duration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[numSatellites].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/GPSRTKFact.json"/>
+        <source>Number of Satellites</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[currentLatitude].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/GPSRTKFact.json"/>
+        <source>Current Survey-In Latitude</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>BatteryFact.json</name>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[instantPower].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/BatteryFact.json"/>
+        <source>Watts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[temperature].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/BatteryFact.json"/>
+        <source>Temperature</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[timeRemaining].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/BatteryFact.json"/>
+        <source>Time Remaining</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[mahConsumed].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/BatteryFact.json"/>
+        <source>Consumed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[percentRemaining].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/BatteryFact.json"/>
+        <source>Percent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[current].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/BatteryFact.json"/>
+        <source>Current</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[voltage].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/BatteryFact.json"/>
+        <source>Voltage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[chargeState].enumStrings, </extracomment>
+        <location filename="../src/Vehicle/BatteryFact.json"/>
+        <source>n/a,Normal Operation,Low Battery State,Critical Battery State,Emergency Battery State,Battery Failed,Battery Unhealthy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[chargeState].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/BatteryFact.json"/>
+        <source>Charge State</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DistanceSensorFact.json</name>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[rotationYaw90].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/DistanceSensorFact.json"/>
+        <source>Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[rotationYaw225].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/DistanceSensorFact.json"/>
+        <source>Rear/Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[rotationYaw45].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/DistanceSensorFact.json"/>
+        <source>Forward/Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[rotationYaw135].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/DistanceSensorFact.json"/>
+        <source>Rear/Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[rotationYaw315].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/DistanceSensorFact.json"/>
+        <source>Forward/Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[rotationPitch90].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/DistanceSensorFact.json"/>
+        <source>Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[rotationPitch270].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/DistanceSensorFact.json"/>
+        <source>Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[rotationNone].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/DistanceSensorFact.json"/>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[rotationYaw180].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/DistanceSensorFact.json"/>
+        <source>Rear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[rotationYaw270].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/DistanceSensorFact.json"/>
+        <source>Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TerrainFactGroup.json</name>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[blocksPending].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/TerrainFactGroup.json"/>
+        <source>Blocks Pending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[blocksLoaded].shortDescription, </extracomment>
+        <location filename="../src/Vehicle/TerrainFactGroup.json"/>
+        <source>Blocks Loaded</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>APMFollowComponent.FactMetaData.json</name>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[distance].shortDescription, </extracomment>
+        <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+        <source>Horizontal distance from ground station to vehicle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[height].shortDescription, </extracomment>
+        <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+        <source>Vertical distance from Launch (home) position to vehicle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[angle].shortDescription, </extracomment>
+        <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+        <source>Angle from ground station to vehicle</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>APM-MavCmdInfoFixedWing.json</name>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.enumStrings, </extracomment>
+        <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoFixedWing.json"/>
+        <source>Center,Tangent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.label, </extracomment>
+        <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoFixedWing.json"/>
+        <source>Exit loiter from</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>APM-MavCmdInfoCommon.json</name>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.label, </extracomment>
+        <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].description, </extracomment>
+        <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+        <source>Land using VTOL mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].description, </extracomment>
+        <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+        <source>Takeoff to specified altitude.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param3.label, </extracomment>
+        <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+        <source>Yaw</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param2.label, </extracomment>
+        <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+        <source>Roll</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].category, .mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].category, </extracomment>
+        <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+        <source>VTOL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.enumStrings, </extracomment>
+        <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+        <source>On,Off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.label, </extracomment>
+        <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+        <source>Setting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param1.label, </extracomment>
+        <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+        <source>Pitch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
+        <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+        <source>Enable,Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].description, </extracomment>
+        <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+        <source>Take off from the ground and ascend to specified altitude.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_UNLIM].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.label, </extracomment>
+        <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+        <source>Heading</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PX4-MavCmdInfoMultiRotor.json</name>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_UNLIM].description, </extracomment>
+        <location filename="../src/FirmwarePlugin/PX4/PX4-MavCmdInfoMultiRotor.json"/>
+        <source>Travel to a position and Loiter indefinitely.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].description, </extracomment>
+        <location filename="../src/FirmwarePlugin/PX4/PX4-MavCmdInfoMultiRotor.json"/>
+        <source>Travel to a position and Loiter for an amount of time.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].description, </extracomment>
+        <location filename="../src/FirmwarePlugin/PX4/PX4-MavCmdInfoMultiRotor.json"/>
+        <source>Hover straight up to specified altitude. Then travel to specified position.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].description, </extracomment>
+        <location filename="../src/FirmwarePlugin/PX4/PX4-MavCmdInfoMultiRotor.json"/>
+        <source>Travel to a position and Loiter for a number of turns.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AirMap.SettingsGroup.json</name>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[apiKey].shortDescription, </extracomment>
+        <location filename="../src/Airmap/AirMap.SettingsGroup.json"/>
+        <source>AirMap API Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[password].shortDescription, </extracomment>
+        <location filename="../src/Airmap/AirMap.SettingsGroup.json"/>
+        <source>AirMap Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[enableTelemetry].shortDescription, </extracomment>
+        <location filename="../src/Airmap/AirMap.SettingsGroup.json"/>
+        <source>Enable AirMap Telemetry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[enableAirMap].shortDescription, </extracomment>
+        <location filename="../src/Airmap/AirMap.SettingsGroup.json"/>
+        <source>Enable AirMap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[clientID].shortDescription, </extracomment>
+        <location filename="../src/Airmap/AirMap.SettingsGroup.json"/>
+        <source>AirMap Client ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[userName].shortDescription, </extracomment>
+        <location filename="../src/Airmap/AirMap.SettingsGroup.json"/>
+        <source>AirMap User Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[enableAirspace].shortDescription, </extracomment>
+        <location filename="../src/Airmap/AirMap.SettingsGroup.json"/>
+        <source>Show Airspace on Map (Experimental)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[usePersonalApiKey].shortDescription, </extracomment>
+        <location filename="../src/Airmap/AirMap.SettingsGroup.json"/>
+        <source>Use Personal AirMap API Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MissionSettings.FactMetaData.json</name>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[PlannedHomePositionAltitude].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/MissionSettings.FactMetaData.json"/>
+        <source>Launch position altitude</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FWLandingPattern.FactMetaData.json</name>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+        <source>Stop taking video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+        <source>Stop taking photos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[LoiterAltitude].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+        <source>Aircraft will proceed to the loiter point and loiter downwards until it reaches this approach altitude. Once altitude is reached the aircraft will proceed to land.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+        <source>Altitude for landing point.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+        <source>Value controller loiter point is distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+        <source>Loiter radius.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+        <source>Distance between landing and loiter points.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+        <source>Heading from loiter point to land point.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[GlideSlope].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+        <source>The glide slope between the loiter and landing point.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UT-MavCmdInfoFixedWing.json</name>
+    <message>
+        <extracomment>.mavCmdInfo[Override testing].description, .mavCmdInfo[Override testing].category, </extracomment>
+        <location filename="../src/MissionManager/UnitTest/UT-MavCmdInfoFixedWing.json"/>
+        <source>override fw 4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[Override testing].param7.label, </extracomment>
+        <location filename="../src/MissionManager/UnitTest/UT-MavCmdInfoFixedWing.json"/>
+        <source>override fw 4 7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[Override testing].param5.label, </extracomment>
+        <location filename="../src/MissionManager/UnitTest/UT-MavCmdInfoFixedWing.json"/>
+        <source>override fw 4 5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[Override testing].param7.enumStrings, .mavCmdInfo[Override testing].param5.enumStrings, .mavCmdInfo[Override testing].param3.enumStrings, .mavCmdInfo[Override testing].param1.enumStrings, </extracomment>
+        <location filename="../src/MissionManager/UnitTest/UT-MavCmdInfoFixedWing.json"/>
+        <source>1,2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[Override testing].param3.label, </extracomment>
+        <location filename="../src/MissionManager/UnitTest/UT-MavCmdInfoFixedWing.json"/>
+        <source>override fw 4 3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[Override testing].param1.label, </extracomment>
+        <location filename="../src/MissionManager/UnitTest/UT-MavCmdInfoFixedWing.json"/>
+        <source>override fw 4 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UT-MavCmdInfoCommon.json</name>
+    <message>
+        <extracomment>.mavCmdInfo[UNITTEST_3].category, .mavCmdInfo[UNITTEST_4].category, .mavCmdInfo[UNITTEST_5].category, </extracomment>
+        <location filename="../src/MissionManager/UnitTest/UT-MavCmdInfoCommon.json"/>
+        <source>category</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[UNITTEST_5].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/UnitTest/UT-MavCmdInfoCommon.json"/>
+        <source>Unit Test 5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[UNITTEST_2].param1.label, .mavCmdInfo[UNITTEST_3].param1.label, .mavCmdInfo[UNITTEST_4].param1.label, .mavCmdInfo[UNITTEST_5].param1.label, </extracomment>
+        <location filename="../src/MissionManager/UnitTest/UT-MavCmdInfoCommon.json"/>
+        <source>param1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[UNITTEST_4].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/UnitTest/UT-MavCmdInfoCommon.json"/>
+        <source>Unit Test 4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[UNITTEST_3].param7.enumStrings, .mavCmdInfo[UNITTEST_3].param6.enumStrings, .mavCmdInfo[UNITTEST_3].param5.enumStrings, .mavCmdInfo[UNITTEST_3].param4.enumStrings, .mavCmdInfo[UNITTEST_3].param3.enumStrings, .mavCmdInfo[UNITTEST_3].param2.enumStrings, .mavCmdInfo[UNITTEST_3].param1.enumStrings, .mavCmdInfo[UNITTEST_4].param7.enumStrings, .mavCmdInfo[UNITTEST_4].param6.enumStrings, .mavCmdInfo[UNITTEST_4].param5.enumStrings, .mavCmdInfo[UNITTEST_4].param4.enumStrings, .mavCmdInfo[UNITTEST_4].param3.enumStrings, .mavCmdInfo[UNITTEST_4].param2.enumStrings, .mavCmdInfo[UNITTEST_4].param1.enumStrings, .mavCmdInfo[UNITTEST_5].param7.enumStrings, .mavCmdInfo[UNITTEST_5].param6.enumStrings, .mavCmdInfo[UNITTEST_5].param5.enumStrings, .mavCmdInfo[UNITTEST_5].param4.enumStrings, .mavCmdInfo[UNITTEST_5].param3.enumStrings, .mavCmdInfo[UNITTEST_5].param2.enumStrings, .mavCmdInfo[UNITTEST_5].param1.enumStrings, </extracomment>
+        <location filename="../src/MissionManager/UnitTest/UT-MavCmdInfoCommon.json"/>
+        <source>1,2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[UNITTEST_3].param7.label, .mavCmdInfo[UNITTEST_4].param7.label, .mavCmdInfo[UNITTEST_5].param7.label, </extracomment>
+        <location filename="../src/MissionManager/UnitTest/UT-MavCmdInfoCommon.json"/>
+        <source>param7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[UNITTEST_3].param6.label, .mavCmdInfo[UNITTEST_4].param6.label, .mavCmdInfo[UNITTEST_5].param6.label, </extracomment>
+        <location filename="../src/MissionManager/UnitTest/UT-MavCmdInfoCommon.json"/>
+        <source>param6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[UNITTEST_3].param5.label, .mavCmdInfo[UNITTEST_4].param5.label, .mavCmdInfo[UNITTEST_5].param5.label, </extracomment>
+        <location filename="../src/MissionManager/UnitTest/UT-MavCmdInfoCommon.json"/>
+        <source>param5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[UNITTEST_3].param4.label, .mavCmdInfo[UNITTEST_4].param4.label, .mavCmdInfo[UNITTEST_5].param4.label, </extracomment>
+        <location filename="../src/MissionManager/UnitTest/UT-MavCmdInfoCommon.json"/>
+        <source>param4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[UNITTEST_3].param3.label, .mavCmdInfo[UNITTEST_4].param3.label, .mavCmdInfo[UNITTEST_5].param3.label, </extracomment>
+        <location filename="../src/MissionManager/UnitTest/UT-MavCmdInfoCommon.json"/>
+        <source>param3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[UNITTEST_3].param2.label, .mavCmdInfo[UNITTEST_4].param2.label, .mavCmdInfo[UNITTEST_5].param2.label, </extracomment>
+        <location filename="../src/MissionManager/UnitTest/UT-MavCmdInfoCommon.json"/>
+        <source>param2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[UNITTEST_3].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/UnitTest/UT-MavCmdInfoCommon.json"/>
+        <source>Unit Test 3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[UNITTEST_3].description, .mavCmdInfo[UNITTEST_4].description, .mavCmdInfo[UNITTEST_5].description, </extracomment>
+        <location filename="../src/MissionManager/UnitTest/UT-MavCmdInfoCommon.json"/>
+        <source>description</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CameraSpec.FactMetaData.json</name>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[FocalLength].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+        <source>Focal length of camera lens.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[SensorHeight].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+        <source>Height of camera image sensor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[FixedOrientation].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+        <source>Camera orientation ix fixed and cannot be changed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[ImageWidth].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+        <source>Camera image resolution width.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[SensorWidth].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+        <source>Width of camera image sensor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[ImageHeight].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+        <source>Camera image resolution height.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[Landscape].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+        <source>Camera on vehicle is in landscape orientation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[Name].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+        <source>Camera name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[MinTriggerInterval].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+        <source>Minimum amount of time between each camera trigger.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CorridorScan.SettingsGroup.json</name>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[Altitude].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+        <source>Altitude for the bottom layer of the structure scan.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[TurnaroundDistance].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+        <source>Amount of additional distance to add outside the survey area for vehicle turnaround.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[CorridorWidth].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+        <source>Corridor width. Specify 0 width for a single pass scan.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[GridSpacing].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+        <source>Amount of spacing in between parallel grid lines.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[Trigger distance].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+        <source>Distance between each triggering of the camera. 0 specifies not camera trigger.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SpeedSection.FactMetaData.json</name>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[FlightSpeed].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/SpeedSection.FactMetaData.json"/>
+        <source>Set the current flight speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CameraSection.FactMetaData.json</name>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[CameraAction].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+        <source>Specify whether the camera should take photos or video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalDistance].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+        <source>Specify the distance between each photo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[CameraMode].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+        <source>Specify whether the camera should switch to Photo, Video or Survey mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalTime].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+        <source>Specify the time between each photo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[CameraMode].enumStrings, </extracomment>
+        <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+        <source>Photo,Video,Survey</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[GimbalYaw].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+        <source>Gimbal yaw rotation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+        <source>Gimbal pitch rotation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[CameraAction].enumStrings, </extracomment>
+        <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+        <source>No change,Take photo,Take photos (time),Take photos (distance),Stop taking photos,Start recording video,Stop recording video</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CameraCalc.FactMetaData.json</name>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[FrontalOverlap].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+        <source>Amount of overlap between images in the forward facing direction.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[DistanceToSurface].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+        <source>Distance vehicle is away from surface.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+        <source>Value specified is distance to surface.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[SideOverlap].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+        <source>Amount of overlap between images in the side facing direction.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[ImageDensity].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+        <source>Image desity at surface.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[CameraName].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+        <source>Camera name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MavCmdInfoCommon.json</name>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param7.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Cut off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Path planning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DISTANCE].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Wait for distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Guided enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param1.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Timeout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].description, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Change to/from inverted flight.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI_NONE].description, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Cancels the region of interest.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].description, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Set relay to a condition.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].description, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Set camera trigger distance.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param1.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Gripper id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_ALTITUDE_WAIT].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Altitude wait</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_CHANGE_ALT].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Wait for altitude</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_SERVO].description, .mavCmdInfo[MAV_CMD_DO_REPEAT_SERVO].description, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Set servo to specified PWM value.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].category, .mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].category, .mavCmdInfo[MAV_CMD_DO_LAND_START].category, .mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].category, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Flight control</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_CALIBRATION].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Calibration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].param3.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Photo count</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Set launch location</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param3.label, .mavCmdInfo[MAV_CMD_DO_SET_REVERSE].param1.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Direction</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_REBOOT_SHUTDOWN].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Reboot/Shutdown vehicle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_SERVO].param1.label, .mavCmdInfo[MAV_CMD_DO_REPEAT_SERVO].param1.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Servo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Stabilize Yaw</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.enumStrings, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Release,Grab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param3.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Alt/Yaw</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param3.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Step</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Ignore Alt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].param1.enumStrings, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Vehicle position,Specified position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Loiter (altitude)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param5.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Exposure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_REPOSITION].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Reposition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].description, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Continue on the current course and climb/descend to specified altitude. When the altitude is reached continue to the next command.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF_LOCAL].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Takeoff local</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Delay until</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].param2.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Status Frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param1.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Turns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Set relay</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_UNLIM].description, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Travel to a position and Loiter around the specified radius indefinitely.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_RETURN_TO_LAUNCH].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Return To Launch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[HomeRaw].param6.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Longitude</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].param1.enumStrings, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Hover Mode,Plane Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Region of interest</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_PAYLOAD_PREPARE_DEPLOY].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Payload prepare deploy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.enumStrings, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Normal,Inverted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Follow Me</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_MISSION_START].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Mission start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>VTOL Transition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].param1.enumStrings, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Climb,Neutral,Descend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Inverted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].description, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Travel to a position in 3D space using spline path.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].param2.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Custom Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.enumStrings, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Center,Tangent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>VTOL land</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_REPEAT_SERVO].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Cycle servo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_REPEAT_RELAY].param2.label, .mavCmdInfo[MAV_CMD_DO_REPEAT_SERVO].param3.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Cycles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].param3.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Sub Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].category, .mavCmdInfo[MAV_CMD_DO_PARACHUTE].category, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Safety</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Start image capture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param1.label, .mavCmdInfo[MAV_CMD_DO_REPEAT_RELAY].param1.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Relay #</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].description, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Travel to a position and Loiter around the specified radius for an amount of time.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param2.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Shutter spd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Full planning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_SET_SENSOR_OFFSETS].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Set sensor offsets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Camera trigger distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].description, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Mission will continue at the specified item.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].description, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Travel to a position and Loiter around the specified radius for a number of turns.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].description, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Delay unti the specified time is reached.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI_LOCATION].category, .mavCmdInfo[MAV_CMD_DO_SET_ROI_WPNEXT_OFFSET].category, .mavCmdInfo[MAV_CMD_DO_SET_ROI_NONE].category, .mavCmdInfo[MAV_CMD_DO_SET_ROI].category, .mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].category, .mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].category, .mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].category, .mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].category, .mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].category, .mavCmdInfo[MAV_CMD_IMAGE_STOP_CAPTURE].category, .mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].category, .mavCmdInfo[MAV_CMD_VIDEO_STOP_CAPTURE].category, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Camera</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param1.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Abort Alt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[HomeRaw].param5.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Latitude</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Wait for Yaw</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param3.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>PassThru</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param4.enumStrings, .mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param4.enumStrings, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Relative,Absolute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.label, .mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.label, .mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param2.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI_WPNEXT_OFFSET].param7.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Yaw offset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_REQUEST_AUTOPILOT_CAPABILITIES].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Get capabilities</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Set moving direction</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI_WPNEXT_OFFSET].description, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Sets the region of interest to point towards the next waypoint with optional offsets.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_START_RX_PAIR].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Bind Spektrum receiver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_RALLY_LAND].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Rally land</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param2.enumStrings, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Enable,Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param1.label, .mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_DELAY].param1.label, .mavCmdInfo[MAV_CMD_CONDITION_DELAY].param1.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Hold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_TRIGGER_CONTROL].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Trigger control</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].category, .mavCmdInfo[MAV_CMD_DO_SET_MODE].category, .mavCmdInfo[MAV_CMD_DO_JUMP].category, .mavCmdInfo[MAV_CMD_DO_SET_HOME].category, .mavCmdInfo[MAV_CMD_DO_SET_REVERSE].category, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].category, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].category, .mavCmdInfo[MAV_CMD_DO_GRIPPER].category, .mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].category, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Advanced</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].description, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Travel to a position in 3D space.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param3.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Throttle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Change Altitude</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].description, .mavCmdInfo[MAV_CMD_DO_PARACHUTE].description, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Enable/Disable geofence.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_SERVO].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Set servo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Takeoff</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param2.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param3.label, .mavCmdInfo[MAV_CMD_DO_PARACHUTE].param1.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Trigger</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param6.label, .mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param5.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Command</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].description, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Enable/Disabled guided mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].description, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Land vehicle at the specified location.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param4.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Sec (utc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param3.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>ROI Index</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Control Mount</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Inverted flight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI_LOCATION].description, .mavCmdInfo[MAV_CMD_DO_SET_ROI].description, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Sets the region of interest for cameras.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_STOP_CAPTURE].description, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Stop taking photos.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_PANORAMA_CREATE].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Create panorama</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_CHANGE_ALT].description, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Delay the mission until the specified altitide is reached.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param1.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_UNLIM].param3.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param3.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param3.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param2.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_UAVCAN].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>UAVCAN configure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Heading wait</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Spline waypoint</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].description, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Hover straight up to specified altitude, transition to fixed-wing and fly to the specified takeoff location.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].category, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>VTOL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Set camera modes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_UNLIM].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.label, .mavCmdInfo[MAV_CMD_NAV_LAND].param4.label, .mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param4.label, .mavCmdInfo[MAV_CMD_CONDITION_YAW].param1.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Yaw</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_PAYLOAD_CONTROL_DEPLOY].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Payload control deploy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_SET_MESSAGE_INTERVAL].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Set message interval</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].description, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Loiter at specified position until altitude reached.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].description, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Change speed and/or throttle set points.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Start video capture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param4.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>ISO</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_FLIGHTTERMINATION].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Flight termination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[HomeRaw].category, .mavCmdInfo[MAV_CMD_NAV_WAYPOINT].category, .mavCmdInfo[MAV_CMD_NAV_RETURN_TO_LAUNCH].category, .mavCmdInfo[MAV_CMD_NAV_LAND].category, .mavCmdInfo[MAV_CMD_NAV_TAKEOFF].category, .mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].category, .mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].category, .mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].category, .mavCmdInfo[MAV_CMD_CONDITION_DELAY].category, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Basic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.enumStrings, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Disable,Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>AutoTune Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].description, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Delay the mission until the specified yaw is reached.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param2.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Repeat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].description, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Control onboard camera.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].description, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Delay mission state machine until gate has been reached.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param2.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Hour (utc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW_REPOSITION].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Vehicle reposition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].description, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Set camera photo, video modes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param4.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Heading goal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].description, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Operate EPM gripper.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].description, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Configure the vehicle mount (e.g. gimbal).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].param2.enumStrings, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Take photos,Record video,Survey photo mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Enable geofence</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param4.label, .mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param4.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Offset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_GET_HOME_POSITION].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Get launch position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_STOP_CAPTURE].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Stop image capture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Land</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].description, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Start taking one or more photos.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Gripper</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_STOP_CAPTURE].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Stop video capture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param2.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Shutter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].description, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Perform flight mode transition.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_PAUSE_CONTINUE].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Pause/Continue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.enumStrings, .mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.enumStrings, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>False,True</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Local planning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_REPEAT_RELAY].param3.label, .mavCmdInfo[MAV_CMD_DO_REPEAT_SERVO].param4.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Action</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param2.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Lon/Roll</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_CHANGE_ALT].category, .mavCmdInfo[MAV_CMD_CONDITION_DISTANCE].category, .mavCmdInfo[MAV_CMD_CONDITION_YAW].category, .mavCmdInfo[MAV_CMD_CONDITION_GATE].category, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Conditionals</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param3.enumStrings, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Clockwise,Counter-Clockwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Guided limits</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param3.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Min (utc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_LAND_START].description, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Marker to indicate start of landing sequence.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param2.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Mission Index</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Configure Mount</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].description, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>AutoTune Enable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Change speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param1.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param7.enumStrings, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].description, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Configure onboard camera controller.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Condition Gate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].description, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Launch from the ground and travel towards the specified takeoff position.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].param1.enumStrings, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Disable,Enable,Release</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_CONTROL_VIDEO].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Control video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_OVERRIDE_GOTO].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Override goto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].description, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Set moving direction to forward or reverse.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DISTANCE].description, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Delay the mission until within the specified distance of the next waypoint.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI_WPNEXT_OFFSET].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>ROI to next waypoint</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DELAY].description, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Delay the mission for the number of seconds.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param3.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Max Alt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.enumStrings, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Disable,Enable,Enable+reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[HomeRaw].description, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Planned home position for mission.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param2.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Acceptance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_GO_AROUND].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Go around</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Stabilize Roll</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DELAY].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Delay</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_PARAMETER].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Set Parameter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI_NONE].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Cancel ROI</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[HomeRaw].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Home Position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Waypoint</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param3.enumStrings, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>No Trigger,Once Immediately</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_REPEAT_RELAY].description, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Cycle relay on/off for desired cycles/time.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param2.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Min Alt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Stabilize Pitch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param4.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Focus lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Disable,Disable floor only,Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_MOTOR_TEST].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Motor test</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_GET_MESSAGE_INTERVAL].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Get message interval</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Exit loiter from</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Camera control</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI_WPNEXT_OFFSET].param6.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Roll offset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].param1.enumStrings, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Forward,Reverse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Trigger parachute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param4.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>H Limit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].description, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Control the vehicle mount (e.g. gimbal).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param1.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Item #</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_STORAGE].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Store parameters</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>VTOL takeoff</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Set flight mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND_LOCAL].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Land local</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DISTANCE].param1.label, .mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param1.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].param2.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Interval</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param1.enumStrings, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>None,Next waypoint,Mission item,Location,ROI item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].description, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Control autonomous path planning.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_REPEAT_RELAY].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Cycle relay</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].param1.label, .mavCmdInfo[MAV_CMD_DO_SET_MODE].param1.label, .mavCmdInfo[MAV_CMD_DO_SET_HOME].param1.label, .mavCmdInfo[MAV_CMD_DO_SET_ROI].param1.label, .mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param1.label, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param1.label, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param7.label, .mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].param2.label, .mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].param1.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Loiter (turns)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_UNLIM].friendlyName, .mavCmdInfo[MAV_CMD_NAV_LOITER_UNLIM].category, .mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].category, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].category, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].category, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Loiter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI_LOCATION].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Region of interest (ROI)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param3.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Aperture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_LAND_START].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Land start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_SERVO].param2.label, .mavCmdInfo[MAV_CMD_DO_REPEAT_SERVO].param2.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>PWM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_STOP_CAPTURE].description, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Stop video capture.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_COMPONENT_ARM_DISARM].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Arm/Disarm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].description, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Fly to specified location at current altitude, transition to multi-rotor and land.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.enumStrings, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Disable,Enable,Enable+reset,Enable+reset route only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].description, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Set limits for external control</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].description, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Set flight mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Camera config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param2.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.enumStrings, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>No,Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI_WPNEXT_OFFSET].param5.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Pitch offset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_FOLLOW].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Nav follow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Loiter (time)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_CHANGE_ALT].param1.label, .mavCmdInfo[MAV_CMD_CONDITION_YAW].param2.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Rate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].description, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Start video capture.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param1.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Lat/Pitch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param1.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Pitch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Set mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_RETURN_TO_LAUNCH].description, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Send the vehicle back to the launch position.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].friendlyName, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Jump to item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param6.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.enumStrings, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Airspeed,Ground Speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].description, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+        <source>Changes the launch location either to the current location or a specified location.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Survey.SettingsGroup.json</name>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[GridAngle].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+        <source>Angle for parallel lines of grid.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[SplitConcavePolygons].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+        <source>Split mission concave polygons into separate regular, convex polygons.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[FlyAlternateTransects].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+        <source>Fly every other transect in each pass.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TransectStyle.SettingsGroup.json</name>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[CameraTriggerInTurnAround].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+        <source>Camera continues taking images in turn arounds.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[Refly90Degrees].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+        <source>Refly the pattern at a 90 degree angle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[TurnAroundDistance].shortDescription, .QGC.MetaData.Facts[TurnAroundDistanceMultiRotor].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+        <source>Amount of additional distance to add outside the survey area for vehicle turn around.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[HoverAndCapture].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+        <source>Stop and Hover at each image point before taking image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxDescentRate].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+        <source>The maximum descent rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxClimbRate].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+        <source>The maximum climb rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[TerrainAdjustTolerance].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+        <source>Additional waypoints within the transect will be added if the terrain altitude difference grows larger than this tolerance.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VTOLLandingPattern.FactMetaData.json</name>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[LoiterAltitude].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+        <source>Aircraft will proceed to the loiter point and loiter downwards until it reaches this approach altitude. Once altitude is reached the aircraft will fly to land point at current altitude.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+        <source>Stop taking photos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+        <source>Loiter radius.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+        <source>Altitude for landing point on ground.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+        <source>Stop taking video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+        <source>Distance between landing and loiter points.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+        <source>Heading from loiter point to land point.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QGCMapCircle.Facts.json</name>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[Radius].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/QGCMapCircle.Facts.json"/>
+        <source>Radius for geofence circle.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>StructureScan.SettingsGroup.json</name>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[StartFromTop].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+        <source>Start scanning from top of structure.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[Layers].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+        <source>Number of scan layers.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[ScanBottomAlt].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+        <source>Altitude for the bottomost covered area of the scan. You can adjust this value such that the Bottom Layer Alt will fly above obstacles on the ground.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[EntranceAltitude].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+        <source>Vehicle will fly to/from the structure at this altitude.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+        <source>Gimbal pitch rotation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[StructureHeight].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+        <source>Height of structure being scanned.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>RallyPoint.FactMetaData.json</name>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[Longitude].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+        <source>Longitude of rally point position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[RelativeAltitude].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+        <source>Altitude of rally point position (home relative)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[Latitude].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+        <source>Latitude of rally point position</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>BreachReturn.FactMetaData.json</name>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[Longitude].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+        <source>Longitude of breach return point position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[Altitude].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+        <source>Altitude of breach return point position (Rel)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[Latitude].shortDescription, </extracomment>
+        <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+        <source>Latitude of breach return point position</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MavCmdInfoFixedWing.json</name>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.enumStrings, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoFixedWing.json"/>
+        <source>Center,Tangent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.label, </extracomment>
+        <location filename="../src/MissionManager/MavCmdInfoFixedWing.json"/>
+        <source>Exit loiter from</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>APMMavlinkStreamRate.SettingsGroup.json</name>
+    <message>
+        <extracomment>.QGC.MetaData.Defines.StreamRateEnumStrings, </extracomment>
+        <location filename="../src/Settings/APMMavlinkStreamRate.SettingsGroup.json"/>
+        <source>Controlled By Vehicle,0 hz,1 hz,2 hz,3 hz,4 hz,5 hz,6 hz,7 hz,8 hz,9 hz,10 hz,50 hz,100 hz</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Video.SettingsGroup.json</name>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[showRecControl].longDescription, </extracomment>
+        <location filename="../src/Settings/Video.SettingsGroup.json"/>
+        <source>Show recording control in the UI.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[rtspTimeout].longDescription, </extracomment>
+        <location filename="../src/Settings/Video.SettingsGroup.json"/>
+        <source>How long to wait before assuming RTSP link is gone.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[videoFit].shortDescription, </extracomment>
+        <location filename="../src/Settings/Video.SettingsGroup.json"/>
+        <source>Video Display Fit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[udpPort].longDescription, </extracomment>
+        <location filename="../src/Settings/Video.SettingsGroup.json"/>
+        <source>UDP port to bind to for video stream.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].longDescription, </extracomment>
+        <location filename="../src/Settings/Video.SettingsGroup.json"/>
+        <source>Disable Video Stream when disarmed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[rtspTimeout].shortDescription, </extracomment>
+        <location filename="../src/Settings/Video.SettingsGroup.json"/>
+        <source>RTSP Video Timeout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[videoSource].longDescription, </extracomment>
+        <location filename="../src/Settings/Video.SettingsGroup.json"/>
+        <source>Source for video. UDP, TCP, RTSP and UVC Cameras may be supported depending on Vehicle and ground station version.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[gridLines].enumStrings, </extracomment>
+        <location filename="../src/Settings/Video.SettingsGroup.json"/>
+        <source>Hide,Show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].shortDescription, </extracomment>
+        <location filename="../src/Settings/Video.SettingsGroup.json"/>
+        <source>Video Stream Disnabled When Armed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[gridLines].shortDescription, </extracomment>
+        <location filename="../src/Settings/Video.SettingsGroup.json"/>
+        <source>Video Grid Lines</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[aspectRatio].longDescription, </extracomment>
+        <location filename="../src/Settings/Video.SettingsGroup.json"/>
+        <source>Video Aspect Ratio (width / height). Use 0.0 to ignore it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[recordingFormat].longDescription, </extracomment>
+        <location filename="../src/Settings/Video.SettingsGroup.json"/>
+        <source>Video recording file format.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[tcpUrl].shortDescription, </extracomment>
+        <location filename="../src/Settings/Video.SettingsGroup.json"/>
+        <source>Video TCP Url</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[videoFit].longDescription, </extracomment>
+        <location filename="../src/Settings/Video.SettingsGroup.json"/>
+        <source>Handle Video Aspect Ratio.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[maxVideoSize].longDescription, </extracomment>
+        <location filename="../src/Settings/Video.SettingsGroup.json"/>
+        <source>Maximum amount of disk space used by video recording.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[gridLines].longDescription, </extracomment>
+        <location filename="../src/Settings/Video.SettingsGroup.json"/>
+        <source>Displays a grid overlaid over the video view.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[udpPort].shortDescription, </extracomment>
+        <location filename="../src/Settings/Video.SettingsGroup.json"/>
+        <source>Video UDP Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[tcpUrl].longDescription, </extracomment>
+        <location filename="../src/Settings/Video.SettingsGroup.json"/>
+        <source>TCP url address and port to bind to for video stream. Example: 192.168.143.200:3001</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[maxVideoSize].shortDescription, </extracomment>
+        <location filename="../src/Settings/Video.SettingsGroup.json"/>
+        <source>Max Video Storage Usage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[streamEnabled].shortDescription, </extracomment>
+        <location filename="../src/Settings/Video.SettingsGroup.json"/>
+        <source>Video Stream Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[videoFit].enumStrings, </extracomment>
+        <location filename="../src/Settings/Video.SettingsGroup.json"/>
+        <source>Fit Width,Fit Height,Stretch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[rtspUrl].shortDescription, </extracomment>
+        <location filename="../src/Settings/Video.SettingsGroup.json"/>
+        <source>Video RTSP Url</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[lowLatencyMode].shortDescription, </extracomment>
+        <location filename="../src/Settings/Video.SettingsGroup.json"/>
+        <source>Tweaks video for lower latency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[recordingFormat].shortDescription, </extracomment>
+        <location filename="../src/Settings/Video.SettingsGroup.json"/>
+        <source>Video Recording Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[streamEnabled].longDescription, </extracomment>
+        <location filename="../src/Settings/Video.SettingsGroup.json"/>
+        <source>Start/Stop Video Stream.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[recordingFormat].enumStrings, </extracomment>
+        <location filename="../src/Settings/Video.SettingsGroup.json"/>
+        <source>mkv,mov,mp4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[videoSource].shortDescription, </extracomment>
+        <location filename="../src/Settings/Video.SettingsGroup.json"/>
+        <source>Video source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[videoSavePath].shortDescription, </extracomment>
+        <location filename="../src/Settings/Video.SettingsGroup.json"/>
+        <source>Video save directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[enableStorageLimit].longDescription, </extracomment>
+        <location filename="../src/Settings/Video.SettingsGroup.json"/>
+        <source>When enabled, old video files will be auto-deleted when the total size of QGC-recorded video exceeds the maximum video storage usage.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[lowLatencyMode].longDescription, </extracomment>
+        <location filename="../src/Settings/Video.SettingsGroup.json"/>
+        <source>If this option is enabled, the rtpjitterbuffer is removed and the video sink is set to assynchronous mode, reducing the latency by about 200 ms.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[aspectRatio].shortDescription, </extracomment>
+        <location filename="../src/Settings/Video.SettingsGroup.json"/>
+        <source>Video Aspect Ratio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[enableStorageLimit].shortDescription, </extracomment>
+        <location filename="../src/Settings/Video.SettingsGroup.json"/>
+        <source>Enable/Disable Limits on Storage Usage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[showRecControl].shortDescription, </extracomment>
+        <location filename="../src/Settings/Video.SettingsGroup.json"/>
+        <source>Show Video Record Control</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[videoSavePath].longDescription, </extracomment>
+        <location filename="../src/Settings/Video.SettingsGroup.json"/>
+        <source>Directory to save videos to.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[rtspUrl].longDescription, </extracomment>
+        <location filename="../src/Settings/Video.SettingsGroup.json"/>
+        <source>RTSP url address and port to bind to for video stream. Example: rtsp://192.168.42.1:554/live</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AutoConnect.SettingsGroup.json</name>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[nmeaUdpPort].shortDescription, </extracomment>
+        <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+        <source>Udp port to receive NMEA streams</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].longDescription, </extracomment>
+        <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+        <source>If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a SiK Radio communication link.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].shortDescription, </extracomment>
+        <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+        <source>Automatically connect to an RTK GPS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[autoConnectUDP].longDescription, </extracomment>
+        <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+        <source>If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a UDP communication link.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[autoConnectPX4Flow].longDescription, </extracomment>
+        <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+        <source>If this option is enabled GroundControl will automatically connect to a PX4 Flow board which is connected via USB.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[udpTargetHostPort].shortDescription, </extracomment>
+        <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+        <source>UDP target host port for autoconnect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].longDescription, </extracomment>
+        <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+        <source>If this option is enabled GroundControl will automatically connect to a LibrePilot board which is connected via USB.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].longDescription, </extracomment>
+        <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+        <source>If this option is enabled GroundControl will automatically connect to a Pixhawk board which is connected via USB.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[autoConnectNmeaPort].shortDescription, .QGC.MetaData.Facts[autoConnectNmeaPort].longDescription, </extracomment>
+        <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+        <source>NMEA GPS device for GCS position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].shortDescription, </extracomment>
+        <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+        <source>Automatically connect to a SiK Radio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[autoConnectUDP].shortDescription, </extracomment>
+        <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+        <source>Automatically open a connection over UDP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[autoConnectNmeaBaud].shortDescription, .QGC.MetaData.Facts[autoConnectNmeaBaud].longDescription, </extracomment>
+        <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+        <source>NMEA GPS Baudrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[udpListenPort].shortDescription, </extracomment>
+        <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+        <source>UDP port for autoconnect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[udpTargetHostIP].shortDescription, </extracomment>
+        <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+        <source>UDP target host IP for autoconnect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[autoConnectPX4Flow].shortDescription, </extracomment>
+        <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+        <source>Automatically connect to a P4 Flow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].shortDescription, </extracomment>
+        <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+        <source>Automatically connect to a Pixhawk board</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].shortDescription, </extracomment>
+        <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+        <source>Automatically connect to a LibrePilot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].longDescription, </extracomment>
+        <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+        <source>If this option is enabled GroundControl will automatically connect to an RTK GPS which is connected via USB.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>BrandImage.SettingsGroup.json</name>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].shortDescription, .QGC.MetaData.Facts[userBrandImageOutdoor].shortDescription, </extracomment>
+        <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+        <source>User-selected brand image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[userBrandImageOutdoor].longDescription, </extracomment>
+        <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+        <source>Location in file system of user-selected brand image (outdoor)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].longDescription, </extracomment>
+        <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+        <source>Location in file system of user-selected brand image (indoor)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FlyView.SettingsGroup.json</name>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[guidedMinimumAltitude].shortDescription, </extracomment>
+        <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+        <source>Minimum altitude for guided actions altitude slider.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[showAdditionalIndicatorsCompass].shortDescription, </extracomment>
+        <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+        <source>Show additional heading indicators on Compass</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[maxGoToLocationDistance].shortDescription, </extracomment>
+        <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+        <source>Maximum distance allowed for Go To Location.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[alternateInstrumentPanel].shortDescription, </extracomment>
+        <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+        <source>Use Vertical Instrument Panel instead of the default one</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[keepMapCenteredOnVehicle].shortDescription, </extracomment>
+        <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+        <source>Keep map centered on vehicle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[guidedMaximumAltitude].shortDescription, </extracomment>
+        <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+        <source>Maximum altitude for guided actions altitude slider.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[lockNoseUpCompass].shortDescription, </extracomment>
+        <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+        <source>Lock Compass Nose-Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[showLogReplayStatusBar].shortDescription, </extracomment>
+        <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+        <source>Show/Hide Log Replay status bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ADSBVehicleManager.SettingsGroup.json</name>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].shortDescription, </extracomment>
+        <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+        <source>Connect to ADSB SBS server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].longDescription, </extracomment>
+        <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+        <source>Connect to ADSB SBS-1 server using specified address/port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[adsbServerHostAddress].shortDescription, </extracomment>
+        <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+        <source>Host address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[adsbServerPort].shortDescription, </extracomment>
+        <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+        <source>Server port</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>App.SettingsGroup.json</name>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].longDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>This value defines the cruising speed for multi-rotor vehicles for use in calculating mission duration.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].longDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>If this option is enabled, all Facts will be written to a CSV file with a 1 Hertz frequency.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[virtualJoystick].longDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>If this option is enabled the virtual joystick will be shown on the Fly view.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[mapboxToken].shortDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>Access token to Mapbox maps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[savePath].longDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>Directory to which all data files  are saved/loaded from</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[language].shortDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>Language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[indoorPalette].enumStrings, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>Indoor,Outdoor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[showLargeCompass].longDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>Show large compass on instrument panel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[followTarget].enumStrings, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>Never,Always,When in Follow Me Flight Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleType].shortDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>Offline editing vehicle type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[autoLoadMissions].shortDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>AutoLoad mission on vehicle connect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[language].enumStrings, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>System,български (Bulgarian),中文 (Chinese),Nederlands (Dutch),English,Suomi (Finnish),Français (French),Deutsche (German),Ελληνικά (Greek), עברית (Hebrew),Italiano (Italian),日本人 (Japanese),한국어 (Korean),Norsk (Norwegian),Polskie (Polish),Português (Portuguese),Pусский (Russian),Español (Spanish),Svenska (Swedish),Türk (Turkish)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[checkInternet].shortDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>Check Internet connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[enableMicrohard].shortDescription, .QGC.MetaData.Facts[enableMicrohard].longDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>Enable Microhard Module Support</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[telemetrySave].shortDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>Save telemetry Log after each flight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[useChecklist].longDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>If this option is enabled the preflight checklist will be used.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[gstDebugLevel].shortDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>Video streaming debug</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[telemetrySave].longDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>If this option is enabled a telemetry will be saved after each flight completes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].longDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>This value defines the default speed for calculating mission statistics for multi-rotor vehicles or VTOL vehicle in multi-rotor mode. It does not modify the flight speed for a specific flight plan.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[firstRunPromptIdsShown].shortDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>Comma separated list of first run prompt ids which have already been shown.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[appFontPointSize].shortDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>Application font size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].longDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>If this option is enabled a telemtry log will be saved even if vehicle was never armed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareType].shortDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>Offline editing firmware type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[defaultFirmwareType].shortDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>Default firmware type for flashing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[mapboxToken].longDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>Your personal access token for Mapbox maps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].longDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>Location in file system of user-selected brand image (indoor)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[esriToken].shortDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>Access token to Esri maps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[enforceChecklist].longDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>If this option is enabled the preflight checklist must pass before arming.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[virtualJoystickCentralized].longDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>If this option is enabled the virtual joystick throttle stick will be centralized.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[enforceChecklist].shortDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>Preflight checklist must pass before arming</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].longDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>This value specifies the default altitude for new items added to a mission.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[showLargeCompass].shortDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>Show large compass</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].shortDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>Offline editing descent speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[esriToken].longDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>Your personal access token for Esri maps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[usePairing].longDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>Use Link Pairing.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].shortDescription, .QGC.MetaData.Facts[userBrandImageOutdoor].shortDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>User-selected brand image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[savePath].shortDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>Application save directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].shortDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>Announce battery remaining percent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].shortDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>Offline editing ascent speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleType].enumStrings, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>Fixed Wing,Multi-Rotor,VTOL,Rover,Sub</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[gstDebugLevel].longDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>Sets the environment variable GST_DEBUG for all pipeline elements on boot.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].shortDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>Save CSV Telementry Logs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].shortDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>Default value for altitude</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[enableTaisync].shortDescription, .QGC.MetaData.Facts[enableTaisync].longDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>Enable Taisync Module Support</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[apmStartMavlinkStreams].shortDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>Request start of MAVLink telemetry streams (ArduPilot only)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[disableAllPersistence].shortDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>Disable all data persistence</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].longDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>Announce the remaining battery percent when it falls below the specified percentage.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[indoorPalette].shortDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>Application color scheme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].shortDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>Offline editing cruise speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[disableAllPersistence].longDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>If this option is set, nothing will be saved to disk.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[autoLoadMissions].longDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>Automatically load a mission file named AutoLoad#.mission when a vehicle with id # connects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[audioMuted].shortDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>Mute audio output</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].shortDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>Offline editing hover speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].longDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>This value defines the ascent speed for multi-rotor vehicles for use in calculating mission duration.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[virtualJoystick].shortDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>Show virtual joystick</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[appFontPointSize].longDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>The point size for the default font used.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[audioMuted].longDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>If this option is enabled all audio output will be muted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[userBrandImageOutdoor].longDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>Location in file system of user-selected brand image (outdoor)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[checkInternet].longDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>Check Internet connection before accessing Internet resources.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[usePairing].shortDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>Use Pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].shortDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>Save telemetry log even if vehicle was not armed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareType].enumStrings, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>ArduPilot,PX4 Pro,Mavlink Generic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[virtualJoystickCentralized].shortDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>Set virtual joystick to be centralize throttle (spring-loaded).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[followTarget].shortDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>Stream GCS' coordinates to Autopilot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].longDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>This value defines the default speed for calculating mission statistics for vehicles which do not support hover or VTOL vehicles in fixed wing mode. It does not modify the flight speed for a specific flight plan.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[indoorPalette].longDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>The color scheme for the user interface.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[enableTaisyncVideo].shortDescription, .QGC.MetaData.Facts[enableTaisyncVideo].longDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>Enable Taisync Video Support</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[useChecklist].shortDescription, </extracomment>
+        <location filename="../src/Settings/App.SettingsGroup.json"/>
+        <source>Use preflight checklist</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>RTK.SettingsGroup.json</name>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].shortDescription, </extracomment>
+        <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+        <source>Survey in accuracy (U-blox only)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].longDescription, </extracomment>
+        <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+        <source>Specify the values for the RTK base position without having to do a survey in.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].shortDescription, </extracomment>
+        <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+        <source>Base Position Latitude</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].longDescription, </extracomment>
+        <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+        <source>Defines the minimum amount of observation time for the position calculation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].shortDescription, </extracomment>
+        <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+        <source>Base Position Accuracy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].shortDescription, </extracomment>
+        <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+        <source>Base Position Alt (WGS84)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].longDescription, </extracomment>
+        <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+        <source>Defines the altitude of the fixed RTK base position.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].longDescription, </extracomment>
+        <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+        <source>The minimum accuracy value that Survey-In must achieve before it can complete.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].shortDescription, </extracomment>
+        <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+        <source>Use specified base position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].shortDescription, </extracomment>
+        <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+        <source>Minimum observation time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].longDescription, </extracomment>
+        <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+        <source>Defines the longitude of the fixed RTK base position.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].shortDescription, </extracomment>
+        <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+        <source>Base Position Longitude</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].longDescription, </extracomment>
+        <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+        <source>Defines the accuracy of the fixed RTK base position.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].longDescription, </extracomment>
+        <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+        <source>Defines the latitude of the fixed RTK base position.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FlightMap.SettingsGroup.json</name>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[mapType].shortDescription, </extracomment>
+        <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+        <source>Currently selected map type for flight maps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[mapProvider].shortDescription, </extracomment>
+        <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+        <source>Currently selected map provider for flight maps</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FirmwareUpgrade.SettingsGroup.json</name>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[defaultFirmwareType].shortDescription, </extracomment>
+        <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+        <source>Default firmware type for flashing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[apmVehicleType].enumStrings, </extracomment>
+        <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+        <source>Multi-Rotor,Helicopter,Plane,Rover,Sub</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[apmChibiOS].enumStrings, </extracomment>
+        <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+        <source>ChibiOS,NuttX</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlanView.SettingsGroup.json</name>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[displayPresetsTabFirst].shortDescription, </extracomment>
+        <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+        <source>Display the presets tab at start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[takeoffItemNotRequired].shortDescription, </extracomment>
+        <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+        <source>Allow missions to not require a takeoff item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[showGimbalOnlyWhenSet].shortDescription, </extracomment>
+        <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+        <source>Show gimbal yaw visual only when set explicitly for the waypoint</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[aboveTerrainWarning].shortDescription, </extracomment>
+        <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+        <source>Don't warn user about 'Above Terrain' usage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[showMissionItemStatus].shortDescription, </extracomment>
+        <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+        <source>Show/Hide the mission item status display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[useConditionGate].shortDescription, </extracomment>
+        <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+        <source>Use MAV_CMD_CONDITION_GATE for pattern generation</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OfflineMaps.SettingsGroup.json</name>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[minZoomLevelDownload].shortDescription, </extracomment>
+        <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+        <source>Minimum zoom level for downloads.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[maxZoomLevelDownload].shortDescription, </extracomment>
+        <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+        <source>Maximum zoom level for downloads.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[maxTilesForDownload].shortDescription, </extracomment>
+        <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+        <source>Maximum number of tiles for download.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>RCToParamDialog.FactMetaData.json</name>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[Scale].shortDescription, </extracomment>
+        <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+        <source>Scale the RC range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[MaxValue].shortDescription, </extracomment>
+        <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+        <source>Maximum parameter value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[MinValue].shortDescription, </extracomment>
+        <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+        <source>Minimum parameter value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[CenterValue].shortDescription, </extracomment>
+        <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+        <source>Parameter value when RC output is 0</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditPositionDialog.FactMetaData.json</name>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[Easting].shortDescription, </extracomment>
+        <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+        <source>Easting of item position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[Latitude].shortDescription, </extracomment>
+        <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+        <source>Latitude of item position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[Northing].shortDescription, </extracomment>
+        <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+        <source>Northing of item position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[MGRS].shortDescription, </extracomment>
+        <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+        <source>MGRS coordinate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[Zone].shortDescription, </extracomment>
+        <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+        <source>UTM zone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[Hemisphere].shortDescription, </extracomment>
+        <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+        <source>Hemisphere for position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[Hemisphere].enumStrings, </extracomment>
+        <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+        <source>North,South</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <extracomment>.QGC.MetaData.Facts[Longitude].shortDescription, </extracomment>
+        <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+        <source>Longitude of item position</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/translations/qgc-lupdate-json.py b/translations/qgc-lupdate-json.py
index abcc8de76ed607de429fa3844e863497e77ec200..2faa978b62c6cd43e6c26a6ee63a44be3b4f0113 100755
--- a/translations/qgc-lupdate-json.py
+++ b/translations/qgc-lupdate-json.py
@@ -86,17 +86,11 @@ def walkDirectoryTreeForJsonFiles(dir, multiFileLocArray):
         if (os.path.isdir(path)):
             walkDirectoryTreeForJsonFiles(path, multiFileLocArray)
 
-def appendToQGCTSFile(multiFileLocArray):
-    originalTSFile = codecs.open('qgc.ts', 'r', "utf-8")
-    newTSFile = codecs.open('qgc.ts.new', 'w', "utf-8")
-    line = originalTSFile.readline()
-    while (line != "</TS>\n"):
-        newTSFile.write(line);
-        line = originalTSFile.readline()
-    originalTSFile.close()
+def writeJsonTSFile(multiFileLocArray):
+    jsonTSFile = codecs.open('qgc-json.ts', 'w', "utf-8")
     for entry in multiFileLocArray:
-        newTSFile.write("<context>\n")
-        newTSFile.write("    <name>%s</name>\n" % entry[0])
+        jsonTSFile.write("<context>\n")
+        jsonTSFile.write("    <name>%s</name>\n" % entry[0])
         singleFileLocStringDict = entry[2]
         for locStr in singleFileLocStringDict.keys():
             disambiguation = ""
@@ -108,25 +102,25 @@ def appendToQGCTSFile(multiFileLocArray):
                     sys.exit(1)
                 disambiguation = workStr[:terminatorIndex]
                 locStr = workStr[terminatorIndex+1:]
-            newTSFile.write("    <message>\n")
+            jsonTSFile.write("    <message>\n")
             if len(disambiguation):
-                newTSFile.write("        <comment>%s</comment>\n" % disambiguation)
+                jsonTSFile.write("        <comment>%s</comment>\n" % disambiguation)
             extraCommentStr = ""
             for jsonHierachy in singleFileLocStringDict[locStr]:
                 extraCommentStr += "%s, " % jsonHierachy
-            newTSFile.write("        <extracomment>%s</extracomment>\n" % extraCommentStr)
-            newTSFile.write("        <location filename=\"%s\"/>\n" % entry[1])
-            newTSFile.write(unicode("        <source>%s</source>\n") % locStr)
-            newTSFile.write("        <translation type=\"unfinished\"></translation>\n")
-            newTSFile.write("    </message>\n")
-        newTSFile.write("</context>\n")
-    newTSFile.write("</TS>\n")
-    newTSFile.close()
+            jsonTSFile.write("        <extracomment>%s</extracomment>\n" % extraCommentStr)
+            jsonTSFile.write("        <location filename=\"%s\"/>\n" % entry[1])
+            jsonTSFile.write(unicode("        <source>%s</source>\n") % locStr)
+            jsonTSFile.write("        <translation type=\"unfinished\"></translation>\n")
+            jsonTSFile.write("    </message>\n")
+        jsonTSFile.write("</context>\n")
+    jsonTSFile.write("</TS>\n")
+    jsonTSFile.close()
 
 def main():
     multiFileLocArray = []
     walkDirectoryTreeForJsonFiles("../src", multiFileLocArray)
-    appendToQGCTSFile(multiFileLocArray)
+    writeJsonTSFile(multiFileLocArray)
 
 if __name__ == '__main__':
     main()
diff --git a/translations/qgc-lupdate.sh b/translations/qgc-lupdate.sh
new file mode 100755
index 0000000000000000000000000000000000000000..f7117ebb1f56072ad157adf21111c382bc5f655e
--- /dev/null
+++ b/translations/qgc-lupdate.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+# This script will update both the Qt and Json string translation files.
+QT_PATH=~//Qt/5.12.6/gcc_64/bin
+rm qgc-qt.ts
+$QT_PATH/lupdate ../src -ts qgc.ts
+python qgc-lupdate-json.py
diff --git a/translations/qgc.ts b/translations/qgc.ts
index 334d234d1c0a0cba18aa24c222566c79814de5b0..03e86c7a30ef7d26960b9c691478c16c85090854 100644
--- a/translations/qgc.ts
+++ b/translations/qgc.ts
@@ -1,45 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.1">
+<context>
+    <name>ADSBVehicleManager</name>
+    <message>
+        <location filename="../src/ADSB/ADSBVehicleManager.cc" line="69"/>
+        <source>ADSB Server Error: %1</source>
+        <translation type="unfinished"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></translation>
     </message>
@@ -138,78 +152,78 @@
         <translation type="unfinished"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></translation>
     </message>
@@ -332,84 +346,84 @@
         <translation type="unfinished"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></translation>
     </message>
+    <message>
+        <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="1101"/>
+        <source>Follow failed: Home position not set.</source>
+        <translation type="unfinished"></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"></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"></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"></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"></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"></translation>
     </message>
@@ -615,126 +639,320 @@
 <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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></translation>
+    </message>
+    <message>
+        <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.cc" line="17"/>
+        <source>Follow Me</source>
+        <translation type="unfinished"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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>
+        <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="183"/>
+        <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="183"/>
+        <source>5</source>
+        <translation type="unfinished"></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"></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"></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"></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"></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"></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"></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"></translation>
+    </message>
+    <message>
+        <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"></translation>
+    </message>
+    <message>
+        <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="401"/>
+        <source></source>
         <translation type="unfinished"></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>
+        <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"></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>
+        <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="416"/>
+        <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -747,36 +965,46 @@
         <source>Heli Setup is used to setup parameters which are specific to a helicopter.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="401"/>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="416"/>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></translation>
     </message>
-    <message>
-        <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="261"/>
-        <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="261"/>
-        <source>Click Calibrate to start, then:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="262"/>
-        <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="262"/>
-        <source>- Disconnect USB and battery so flight controller powers down</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="263"/>
         <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="263"/>
-        <source>- Connect the battery</source>
+        <source>Click Calibrate to start, then:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="264"/>
         <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="264"/>
-        <source>- The arming tone will be played (if the vehicle has a buzzer attached)</source>
+        <source>- Disconnect USB and battery so flight controller powers down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="265"/>
         <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="265"/>
-        <source>- If using a flight controller with a safety button press it until it displays solid red</source>
+        <source>- Connect the battery</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="266"/>
         <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="266"/>
-        <source>- You will hear a musical tone then two beeps</source>
+        <source>- The arming tone will be played (if the vehicle has a buzzer attached)</source>
         <translation type="unfinished"></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>
+        <source>- If using a flight controller with a safety button press it until it displays solid red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="268"/>
         <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="268"/>
-        <source>- And finally a single long beep indicating the end points have been set and the ESC is calibrated</source>
+        <source>- You will hear a musical tone then two beeps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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"></translation>
+    </message>
+    <message>
+        <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"></translation>
+    </message>
+    <message>
+        <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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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>
+        <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"></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>
+        <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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></translation>
     </message>
@@ -2779,34 +3055,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"></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"></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"></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"></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"></translation>
     </message>
@@ -2872,23 +3148,42 @@ 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"></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>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="198"/>
-        <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="198"/>
-        <source>Slide this switch to arm the vehicle and enable the motor test (CAUTION!)</source>
+        <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"></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"></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"></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"></translation>
     </message>
 </context>
@@ -2908,176 +3203,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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></translation>
     </message>
@@ -3124,60 +3419,60 @@ 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"></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"></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>
         <translation type="unfinished"></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>
+        <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"></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>
+        <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="50"/>
+        <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="50"/>
+        <source>Reset</source>
         <translation type="unfinished"></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>
+        <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"></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>
+        <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"></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>
+        <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"></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"></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"></translation>
     </message>
@@ -3188,7 +3483,7 @@ 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>
+        <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"></translation>
     </message>
 </context>
@@ -3674,54 +3969,46 @@ 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"></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"></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"></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"></translation>
     </message>
-</context>
-<context>
-    <name>AnalyzeView</name>
-    <message>
-        <location filename="../src/AnalyzeView/AnalyzeView.qml" line="85"/>
-        <source>Analyze</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
-        <location filename="../src/AnalyzeView/AnalyzeView.qml" line="95"/>
-        <location filename="../src/AnalyzeView/AnalyzeView.qml" line="119"/>
-        <source>Log Download</source>
+        <location filename="../src/FactSystem/FactControls/AltitudeFactTextField.qml" line="49"/>
+        <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/AnalyzeView/AnalyzeView.qml" line="100"/>
-        <source>GeoTag Images</source>
+        <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"></translation>
     </message>
     <message>
-        <location filename="../src/AnalyzeView/AnalyzeView.qml" line="105"/>
-        <location filename="../src/AnalyzeView/AnalyzeView.qml" line="124"/>
-        <source>MAVLink Console</source>
+        <location filename="../src/FactSystem/FactControls/AltitudeFactTextField.qml" line="74"/>
+        <source>Don&apos;t show again</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>AnalyzeView</name>
     <message>
-        <location filename="../src/AnalyzeView/AnalyzeView.qml" line="110"/>
-        <location filename="../src/AnalyzeView/AnalyzeView.qml" line="129"/>
-        <source>MAVLink Inspector</source>
+        <location filename="../src/AnalyzeView/AnalyzeView.qml" line="88"/>
+        <source>Analyze</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -3736,52 +4023,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"></translation>
+    </message>
+    <message>
+        <location filename="../src/QmlControls/AppMessages.qml" line="58"/>
+        <source>Clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/QmlControls/AppMessages.qml" line="66"/>
         <source>Clear All</source>
         <translation type="unfinished"></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"></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"></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"></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"></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"></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"></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"></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"></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"></translation>
     </message>
@@ -3797,30 +4094,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"></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"></translation>
     </message>
+    <message>
+        <location filename="../src/ui/toolbar/ArmedIndicator.qml" line="25"/>
+        <source>Arm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/toolbar/ArmedIndicator.qml" line="25"/>
+        <source>Disarm</source>
+        <translation type="unfinished"></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"></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"></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"></translation>
     </message>
@@ -3833,33 +4140,49 @@ Blue Robotics thrusters are lubricated by water and are not designed to be run i
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>AxisMonitor</name>
+    <message>
+        <location filename="../src/QmlControls/AxisMonitor.qml" line="69"/>
+        <source>Not Mapped</source>
+        <translation type="unfinished"></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"></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"></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"></translation>
     </message>
 </context>
+<context>
+    <name>BlankPlanCreator</name>
+    <message>
+        <location filename="../src/MissionManager/BlankPlanCreator.cc" line="16"/>
+        <source>Blank</source>
+        <translation type="unfinished"></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"></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"></translation>
     </message>
@@ -3867,7 +4190,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"></translation>
     </message>
@@ -4031,158 +4354,76 @@ 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"></translation>
-    </message>
-    <message>
-        <location filename="../src/FlightDisplay/BuiltInPreFlightCheckModel.qml" line="26"/>
-        <source>Hardware</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/FlightDisplay/BuiltInPreFlightCheckModel.qml" line="27"/>
-        <source>Props mounted? Wings secured? Tail secured?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/FlightDisplay/BuiltInPreFlightCheckModel.qml" line="48"/>
-        <source>Please arm the vehicle here</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/FlightDisplay/BuiltInPreFlightCheckModel.qml" line="51"/>
-        <source>Actuators</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/FlightDisplay/BuiltInPreFlightCheckModel.qml" line="52"/>
-        <source>Move all control surfaces. Did they work properly?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/FlightDisplay/BuiltInPreFlightCheckModel.qml" line="56"/>
-        <source>Motors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/FlightDisplay/BuiltInPreFlightCheckModel.qml" line="57"/>
-        <source>Propellers free? Then throttle up gently. Working properly?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/FlightDisplay/BuiltInPreFlightCheckModel.qml" line="61"/>
-        <source>Mission</source>
-        <translation type="unfinished"></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"></translation>
-    </message>
-    <message>
-        <location filename="../src/FlightDisplay/BuiltInPreFlightCheckModel.qml" line="70"/>
-        <source>Last preparations before launch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/FlightDisplay/BuiltInPreFlightCheckModel.qml" line="74"/>
-        <source>Payload</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/FlightDisplay/BuiltInPreFlightCheckModel.qml" line="75"/>
-        <source>Configured and started? Payload lid closed?</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>CameraCalc</name>
     <message>
-        <location filename="../src/FlightDisplay/BuiltInPreFlightCheckModel.qml" line="80"/>
-        <source>OK for your platform? Lauching into the wind?</source>
+        <location filename="../src/MissionManager/CameraCalc.cc" line="225"/>
+        <source>CameraCalc section version %1 not supported</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FlightDisplay/BuiltInPreFlightCheckModel.qml" line="84"/>
-        <source>Flight area</source>
+        <location filename="../src/MissionManager/CameraCalc.cc" line="279"/>
+        <source>Custom Camera</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FlightDisplay/BuiltInPreFlightCheckModel.qml" line="85"/>
-        <source>Launch area and path free of obstacles/people?</source>
+        <location filename="../src/MissionManager/CameraCalc.cc" line="284"/>
+        <source>Manual (no camera specs)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>CameraCalc</name>
-    <message>
-        <location filename="../src/PlanView/CameraCalc.qml" line="75"/>
-        <source>Camera</source>
-        <translation type="unfinished"></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"></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"></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"></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"></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"></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"></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"></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"></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"></translation>
     </message>
     <message>
-        <location filename="../src/PlanView/CameraCalc.qml" line="254"/>
-        <source>Ground Res</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/MissionManager/CameraCalc.cc" line="226"/>
-        <source>CameraCalc section version %1 not supported</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/MissionManager/CameraCalc.cc" line="302"/>
-        <source>Custom Camera</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/MissionManager/CameraCalc.cc" line="307"/>
-        <source>Manual (no camera specs)</source>
+        <location filename="../src/PlanView/CameraCalcGrid.qml" line="107"/>
+        <source>Grnd Res</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -4319,127 +4560,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"></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"></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"></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"></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"></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"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="225"/>
         <source>Camera Selector:</source>
         <translation type="unfinished"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="435"/>
+        <source>Video Screen Fit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightMap/Widgets/CameraPageWidget.qml" line="452"/>
         <source>Reset Camera Defaults</source>
         <translation type="unfinished"></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"></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"></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"></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"></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"></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"></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"></translation>
     </message>
@@ -4447,37 +4703,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"></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"></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"></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"></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"></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"></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"></translation>
     </message>
@@ -4501,7 +4757,7 @@ 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>
+        <source>Launch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4544,7 +4800,7 @@ 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>
+        <source>Launch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4566,11 +4822,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"></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"></translation>
+    </message>
 </context>
 <context>
     <name>ComplianceRules</name>
@@ -4583,23 +4844,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"></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"></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"></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"></translation>
     </message>
@@ -4607,82 +4868,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"></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"></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"></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"></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"></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"></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"></translation>
     </message>
     <message>
-        <location filename="../src/PlanView/CorridorScanEditor.qml" line="104"/>
-        <source>Take images in turnarounds</source>
+        <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"></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"></translation>
+    </message>
+    <message>
+        <location filename="../src/PlanView/CorridorScanEditor.qml" line="100"/>
+        <source>Camera</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/PlanView/CorridorScanEditor.qml" line="163"/>
+        <source>Images in turnarounds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/PlanView/CorridorScanEditor.qml" line="169"/>
         <source>Relative altitude</source>
         <translation type="unfinished"></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"></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"></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"></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"></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"></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"></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"></translation>
     </message>
@@ -4705,19 +4981,6 @@ Blue Robotics thrusters are lubricated by water and are not designed to be run i
         <translation type="unfinished"></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"></translation>
-    </message>
-    <message>
-        <location filename="../src/ViewWidgets/CustomCommandWidgetController.cc" line="48"/>
-        <source>Qml files (*.qml)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>DebugWindow</name>
     <message>
@@ -4871,6 +5134,94 @@ Blue Robotics thrusters are lubricated by water and are not designed to be run i
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>DefaultChecklist</name>
+    <message>
+        <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="25"/>
+        <source>Generic Initial checks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="28"/>
+        <source>Hardware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="29"/>
+        <source>Props mounted? Wings secured? Tail secured?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="50"/>
+        <source>Please arm the vehicle here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="53"/>
+        <source>Actuators</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="54"/>
+        <source>Move all control surfaces. Did they work properly?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="58"/>
+        <source>Motors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="59"/>
+        <source>Propellers free? Then throttle up gently. Working properly?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="63"/>
+        <source>Mission</source>
+        <translation type="unfinished"></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"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="72"/>
+        <source>Last preparations before launch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="76"/>
+        <source>Payload</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="77"/>
+        <source>Configured and started? Payload lid closed?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="81"/>
+        <source>Wind &amp; weather</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="82"/>
+        <source>OK for your platform? Lauching into the wind?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="86"/>
+        <source>Flight area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="87"/>
+        <source>Launch area and path free of obstacles/people?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ESP8266Component</name>
     <message>
@@ -5041,52 +5392,70 @@ 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"></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"></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"></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"></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"></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"></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"></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"></translation>
     </message>
     <message>
-        <location filename="../src/QmlControls/EditPositionDialog.qml" line="118"/>
-        <source>Set From Vehicle Position</source>
+        <location filename="../src/QmlControls/EditPositionDialog.qml" line="124"/>
+        <source>MGRS</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
+    <message>
+        <location filename="../src/QmlControls/EditPositionDialog.qml" line="132"/>
+        <source>Set MGRS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/QmlControls/EditPositionDialog.qml" line="144"/>
+        <source>Set From Vehicle Position</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ExitWithErrorWindow</name>
+    <message>
+        <location filename="../src/ui/ExitWithErrorWindow.qml" line="47"/>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>FWLandingPatternEditor</name>
     <message>
         <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="40"/>
@@ -5099,67 +5468,110 @@ Blue Robotics thrusters are lubricated by water and are not designed to be run i
         <translation type="unfinished"></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"></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"></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"></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"></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"></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"></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"></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"></translation>
     </message>
     <message>
-        <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="177"/>
-        <source>Altitudes relative to home</source>
+        <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="181"/>
+        <source>Altitudes relative to launch</source>
+        <translation type="unfinished"></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"></translation>
+    </message>
+    <message>
+        <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="315"/>
+        <source>Done</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="185"/>
+        <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="191"/>
         <source>Camera</source>
         <translation type="unfinished"></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"></translation>
+    </message>
+    <message>
+        <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="238"/>
+        <source>* Actual flight path will vary.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="247"/>
+        <source>* Avoid tailwind on landing.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="273"/>
         <source>Click in map to set landing point.</source>
         <translation type="unfinished"></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"></translation>
     </message>
 </context>
+<context>
+    <name>FWLandingPatternMapVisual</name>
+    <message>
+        <location filename="../src/PlanView/FWLandingPatternMapVisual.qml" line="261"/>
+        <source>Loiter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/PlanView/FWLandingPatternMapVisual.qml" line="314"/>
+        <source>Landing Area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/PlanView/FWLandingPatternMapVisual.qml" line="351"/>
+        <source>Glide Slope</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>Fact</name>
     <message>
@@ -5191,34 +5603,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"></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"></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"></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"></translation>
     </message>
@@ -5226,7 +5638,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"></translation>
     </message>
@@ -5244,6 +5656,39 @@ Blue Robotics thrusters are lubricated by water and are not designed to be run i
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>FactValueGrid</name>
+    <message>
+        <location filename="../src/QmlControls/FactValueGrid.cc" line="39"/>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/QmlControls/FactValueGrid.cc" line="40"/>
+        <source>Small</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/QmlControls/FactValueGrid.cc" line="41"/>
+        <source>Medium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/QmlControls/FactValueGrid.cc" line="42"/>
+        <source>Large</source>
+        <translation type="unfinished"></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"></translation>
+    </message>
+    <message>
+        <location filename="../src/QmlControls/FactValueGrid.cc" line="302"/>
+        <source>Load Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>FactValueSlider</name>
     <message>
@@ -5489,128 +5934,138 @@ 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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></translation>
+    </message>
+    <message>
+        <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="590"/>
         <source>Sony ILCE-QX1</source>
         <translation type="unfinished"></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"></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"></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"></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"></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"></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"></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>
+        <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="684"/>
+        <source>Flir Duo R</source>
+        <translation type="unfinished"></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"></translation>
     </message>
 </context>
@@ -5647,167 +6102,182 @@ Blue Robotics thrusters are lubricated by water and are not designed to be run i
         <translation type="unfinished"></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"></translation>
+    </message>
+    <message>
+        <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="85"/>
+        <source>Firmware Files (*.px4 *.apj *.bin *.ihx)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="85"/>
+        <source>All Files (*)</source>
+        <translation type="unfinished"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></translation>
     </message>
@@ -5815,100 +6285,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"></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"></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"></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"></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"></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"></translation>
+    </message>
+    <message>
+        <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="560"/>
         <source>Unable to find specified firmware for board type</source>
         <translation type="unfinished"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="28"/>
+        <source>Hardware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="29"/>
+        <source>Props mounted? Wings secured? Tail secured?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="50"/>
+        <source>Please arm the vehicle here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="53"/>
+        <source>Actuators</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="54"/>
+        <source>Move all control surfaces. Did they work properly?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="58"/>
+        <source>Motors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="59"/>
+        <source>Propellers free? Then throttle up gently. Working properly?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="63"/>
+        <source>Mission</source>
+        <translation type="unfinished"></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"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="72"/>
+        <source>Last preparations before launch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="76"/>
+        <source>Payload</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="77"/>
+        <source>Configured and started? Payload lid closed?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="81"/>
+        <source>Wind &amp; weather</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="82"/>
+        <source>OK for your platform? Lauching into the wind?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="86"/>
+        <source>Flight area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="87"/>
+        <source>Launch area and path free of obstacles/people?</source>
+        <translation type="unfinished"></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"></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"></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"></translation>
     </message>
@@ -6034,131 +6597,19 @@ Blue Robotics thrusters are lubricated by water and are not designed to be run i
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>FlightDisplayView</name>
-    <message>
-        <location filename="../src/FlightDisplay/FlightDisplayView.qml" line="165"/>
-        <source>Flight Plan complete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/FlightDisplay/FlightDisplayView.qml" line="205"/>
-        <source>%1 Images Taken</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/FlightDisplay/FlightDisplayView.qml" line="212"/>
-        <source>Remove plan from vehicle</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/FlightDisplay/FlightDisplayView.qml" line="222"/>
-        <source>Leave plan on vehicle</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/FlightDisplay/FlightDisplayView.qml" line="235"/>
-        <source>Resume Mission From Waypoint %1</source>
-        <translation type="unfinished"></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"></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"></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"></translation>
-    </message>
-    <message>
-        <location filename="../src/FlightDisplay/FlightDisplayView.qml" line="502"/>
-        <source>Single</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/FlightDisplay/FlightDisplayView.qml" line="508"/>
-        <source>Multi-Vehicle</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/FlightDisplay/FlightDisplayView.qml" line="650"/>
-        <source>Action</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/FlightDisplay/FlightDisplayView.qml" line="762"/>
-        <source>Approval Pending</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/FlightDisplay/FlightDisplayView.qml" line="764"/>
-        <source>Flight Approved</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/FlightDisplay/FlightDisplayView.qml" line="766"/>
-        <source>Flight Rejected</source>
-        <translation type="unfinished"></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"></translation>
-    </message>
-    <message>
-        <location filename="../src/FlightDisplay/FlightDisplayViewMap.qml" line="304"/>
-        <source>Goto here</source>
-        <comment>Goto here waypoint</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/FlightDisplay/FlightDisplayViewMap.qml" line="415"/>
-        <source>Orbit</source>
-        <comment>Orbit waypoint</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/FlightDisplay/FlightDisplayViewMap.qml" line="429"/>
-        <source>Go to location</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/FlightDisplay/FlightDisplayViewMap.qml" line="440"/>
-        <source>Orbit at location</source>
-        <translation type="unfinished"></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"></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"></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"></translation>
-    </message>
-</context>
 <context>
     <name>FlightMap</name>
     <message>
@@ -6252,54 +6703,160 @@ 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>
+        <location filename="../src/FlightDisplay/FlyViewAirspaceIndicator.qml" line="46"/>
+        <source>Approval Pending</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/toolbar/GPSIndicator.qml" line="46"/>
-        <source>GPS Data Unavailable</source>
+        <location filename="../src/FlightDisplay/FlyViewAirspaceIndicator.qml" line="48"/>
+        <source>Flight Approved</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/toolbar/GPSIndicator.qml" line="59"/>
-        <source>GPS Count:</source>
+        <location filename="../src/FlightDisplay/FlyViewAirspaceIndicator.qml" line="50"/>
+        <source>Flight Rejected</source>
         <translation type="unfinished"></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"></translation>
+        <location filename="../src/FlightDisplay/FlyViewMap.qml" line="329"/>
+        <source>R</source>
+        <comment>rally point map item label</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightDisplay/FlyViewMap.qml" line="354"/>
+        <source>Go here</source>
+        <comment>Go to location waypoint</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightDisplay/FlyViewMap.qml" line="457"/>
+        <source>ROI here</source>
+        <comment>Make this a Region Of Interest</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightDisplay/FlyViewMap.qml" line="493"/>
+        <source>Orbit</source>
+        <comment>Orbit waypoint</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightDisplay/FlyViewMap.qml" line="505"/>
+        <source>Go to location</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightDisplay/FlyViewMap.qml" line="515"/>
+        <source>Orbit at location</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightDisplay/FlyViewMap.qml" line="525"/>
+        <source>ROI at location</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FlyViewMissionCompleteDialog</name>
+    <message>
+        <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="45"/>
+        <source>Flight Plan complete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="81"/>
+        <source>%1 Images Taken</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="88"/>
+        <source>Remove plan from vehicle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="99"/>
+        <source>Leave plan on vehicle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="117"/>
+        <source>Resume Mission From Waypoint %1</source>
+        <translation type="unfinished"></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"></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"></translation>
+    </message>
+</context>
+<context>
+    <name>FlyViewToolStrip</name>
+    <message>
+        <location filename="../src/FlightDisplay/FlyViewToolStrip.qml" line="18"/>
+        <source>Fly</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GPSIndicator</name>
+    <message>
+        <location filename="../src/ui/toolbar/GPSIndicator.qml" line="48"/>
+        <source>GPS Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/toolbar/GPSIndicator.qml" line="48"/>
+        <source>GPS Data Unavailable</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/ui/toolbar/GPSIndicator.qml" line="61"/>
-        <source>GPS Lock:</source>
+        <source>GPS Count:</source>
+        <translation type="unfinished"></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"></translation>
     </message>
     <message>
         <location filename="../src/ui/toolbar/GPSIndicator.qml" line="63"/>
+        <source>GPS Lock:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/toolbar/GPSIndicator.qml" line="65"/>
         <source>HDOP:</source>
         <translation type="unfinished"></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"/>
+        <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="65"/>
+        <location filename="../src/ui/toolbar/GPSIndicator.qml" line="67"/>
         <source>VDOP:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/toolbar/GPSIndicator.qml" line="67"/>
+        <location filename="../src/ui/toolbar/GPSIndicator.qml" line="69"/>
         <source>Course Over Ground:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6307,32 +6864,32 @@ Blue Robotics thrusters are lubricated by water and are not designed to be run i
 <context>
     <name>GPSRTKIndicator</name>
     <message>
-        <location filename="../src/ui/toolbar/GPSRTKIndicator.qml" line="46"/>
+        <location filename="../src/ui/toolbar/GPSRTKIndicator.qml" line="47"/>
         <source>Survey-in Active</source>
         <translation type="unfinished"></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"></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"></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"></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"></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"></translation>
     </message>
@@ -6340,336 +6897,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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences/GeneralSettings.qml" line="221"/>
-        <source>Font Size:</source>
-        <translation type="unfinished"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences/GeneralSettings.qml" line="433"/>
-        <source>Use preflight checklist</source>
+        <location filename="../src/ui/preferences/GeneralSettings.qml" line="211"/>
+        <source>UI Scaling</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/preferences/GeneralSettings.qml" line="276"/>
+        <source>Use Vehicle Pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/preferences/GeneralSettings.qml" line="290"/>
+        <source>Check for Internet connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/preferences/GeneralSettings.qml" line="452"/>
+        <source>Save CSV log of telemetry data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/preferences/GeneralSettings.qml" line="483"/>
+        <source>Use Preflight Checklist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/preferences/GeneralSettings.qml" line="491"/>
+        <source>Enforce Preflight Checklist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/preferences/GeneralSettings.qml" line="500"/>
+        <source>Keep Map Centered On Vehicle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/preferences/GeneralSettings.qml" line="508"/>
+        <source>Show Telemetry Log Replay Status Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences/GeneralSettings.qml" line="441"/>
+        <location filename="../src/ui/preferences/GeneralSettings.qml" line="516"/>
         <source>Virtual Joystick</source>
         <translation type="unfinished"></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"></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"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/preferences/GeneralSettings.qml" line="539"/>
+        <source>Show additional heading indicators on Compass</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/preferences/GeneralSettings.qml" line="546"/>
+        <source>Lock Compass Nose-Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/preferences/GeneralSettings.qml" line="562"/>
         <source>Guided Minimum Altitude</source>
         <translation type="unfinished"></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"></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"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/preferences/GeneralSettings.qml" line="598"/>
         <source>Plan View</source>
         <translation type="unfinished"></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"></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"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/preferences/GeneralSettings.qml" line="632"/>
+        <source>Missions Do Not Require Takeoff Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/preferences/GeneralSettings.qml" line="643"/>
         <source>AutoConnect to the following devices</source>
         <translation type="unfinished"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/preferences/GeneralSettings.qml" line="958"/>
         <source>Video</source>
         <translation type="unfinished"></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"></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"></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"></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"></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"></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"></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"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/preferences/GeneralSettings.qml" line="1053"/>
         <source>Video Recording</source>
         <translation type="unfinished"></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"></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"></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"></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"></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"></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"></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"></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"></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"></translation>
     </message>
@@ -6701,7 +7333,7 @@ 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>
+        <source>GeoFencing allows you to set a virtual fence around the area you want to fly in.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6710,82 +7342,82 @@ Blue Robotics thrusters are lubricated by water and are not designed to be run i
         <translation type="unfinished"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></translation>
     </message>
@@ -6816,7 +7448,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"></translation>
@@ -6913,58 +7545,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"></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"></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"></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"></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"></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"></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"></translation>
     </message>
     <message>
-        <location filename="../src/AnalyzeView/GeoTagController.cc" line="255"/>
-        <source>Geotagging failed. Image requested not present.</source>
+        <location filename="../src/AnalyzeView/GeoTagController.cc" line="252"/>
+        <source>Geotagging failed. Requesting image #%1, but only %2 images present.</source>
         <translation type="unfinished"></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"></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"></translation>
     </message>
@@ -6972,7 +7604,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"></translation>
     </message>
@@ -6980,7 +7612,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"></translation>
     </message>
@@ -7004,7 +7636,7 @@ 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>
+        <source>Return</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7069,7 +7701,12 @@ 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>
+        <source>Go To Location</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="65"/>
+        <source>Return to the launch position of the vehicle.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7078,107 +7715,117 @@ Blue Robotics thrusters are lubricated by water and are not designed to be run i
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="55"/>
-        <source>Arm the vehicle.</source>
+        <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="54"/>
+        <source>ROI</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="56"/>
-        <source>Disarm the vehicle</source>
+        <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="55"/>
+        <source>Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="57"/>
-        <source>WARNING: THIS WILL STOP ALL MOTORS. IF VEHICLE IS CURRENTLY IN THE AIR IT WILL CRASH.</source>
+        <source>Arm the vehicle.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="58"/>
-        <source>Takeoff from ground and hold position.</source>
+        <source>Disarm the vehicle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="59"/>
-        <source>Takeoff from ground and start the current mission.</source>
+        <source>WARNING: THIS WILL STOP ALL MOTORS. IF VEHICLE IS CURRENTLY IN THE AIR IT WILL CRASH.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="60"/>
-        <source>Continue the mission from the current waypoint.</source>
+        <source>Takeoff from ground and hold position.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="61"/>
-        <source>Upload of resume mission failed. Confirm to retry upload</source>
+        <source>Takeoff from ground and start the current mission.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="62"/>
-        <source>Land the vehicle at the current position.</source>
+        <source>Continue the mission from the current waypoint.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="63"/>
-        <source>Return to the home position of the vehicle.</source>
+        <source>Upload of resume mission failed. Confirm to retry upload</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="64"/>
+        <source>Land the vehicle at the current position.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="66"/>
         <source>Change the altitude of the vehicle up or down.</source>
         <translation type="unfinished"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></translation>
     </message>
@@ -7186,7 +7833,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"></translation>
     </message>
@@ -7218,534 +7865,593 @@ Blue Robotics thrusters are lubricated by water and are not designed to be run i
     </message>
 </context>
 <context>
-    <name>Joystick</name>
+    <name>HorizontalFactValueGrid</name>
     <message>
-        <location filename="../src/Joystick/Joystick.cc" line="41"/>
-        <source>Arm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/Joystick/Joystick.cc" line="42"/>
-        <source>Disarm</source>
+        <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>
+        <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>
+        <location filename="../src/QmlControls/InstrumentValueData.cc" line="21"/>
+        <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Joystick/Joystick.cc" line="45"/>
-        <source>Zoom In</source>
+        <location filename="../src/QmlControls/InstrumentValueData.cc" line="22"/>
+        <source>Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Joystick/Joystick.cc" line="46"/>
-        <source>Zoom Out</source>
+        <location filename="../src/QmlControls/InstrumentValueData.cc" line="23"/>
+        <source>Opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Joystick/Joystick.cc" line="47"/>
-        <source>Next Video Stream</source>
+        <location filename="../src/QmlControls/InstrumentValueData.cc" line="24"/>
+        <source>Icon</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>InstrumentValueArea</name>
     <message>
-        <location filename="../src/Joystick/Joystick.cc" line="48"/>
-        <source>Previous Video Stream</source>
+        <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>
+        <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>
+        <location filename="../src/QmlControls/InstrumentValueArea.qml" line="127"/>
+        <source>Reset To Defaults</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>JoystickConfig</name>
+    <name>InstrumentValueEditDialog</name>
     <message>
-        <location filename="../src/VehicleSetup/JoystickConfig.qml" line="27"/>
-        <source>Joystick</source>
+        <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="25"/>
+        <source>Value Display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VehicleSetup/JoystickConfig.qml" line="28"/>
-        <source>Joystick Setup is used to configure a calibrate joysticks.</source>
+        <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="74"/>
+        <source>Icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VehicleSetup/JoystickConfig.qml" line="127"/>
-        <source>Not Mapped</source>
+        <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="114"/>
+        <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VehicleSetup/JoystickConfig.qml" line="167"/>
-        <source>Attitude Controls</source>
+        <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="118"/>
+        <source>Label</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VehicleSetup/JoystickConfig.qml" line="176"/>
-        <source>Lateral</source>
+        <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="131"/>
+        <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VehicleSetup/JoystickConfig.qml" line="176"/>
-        <source>Roll</source>
+        <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="144"/>
+        <source>Show Units</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VehicleSetup/JoystickConfig.qml" line="205"/>
-        <source>Forward</source>
+        <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="149"/>
+        <source>Range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VehicleSetup/JoystickConfig.qml" line="205"/>
-        <source>Pitch</source>
+        <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"></translation>
     </message>
     <message>
-        <location filename="../src/VehicleSetup/JoystickConfig.qml" line="234"/>
-        <source>Yaw</source>
+        <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>
+        <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"></translation>
     </message>
     <message>
-        <location filename="../src/VehicleSetup/JoystickConfig.qml" line="293"/>
-        <source>Skip</source>
+        <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="337"/>
+        <source>Specify the icon you want to display based on value ranges.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VehicleSetup/JoystickConfig.qml" line="300"/>
-        <source>Cancel</source>
+        <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="436"/>
+        <source>Specify the icon opacity you want based on value ranges.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VehicleSetup/JoystickConfig.qml" line="308"/>
-        <source>Calibrate</source>
+        <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="504"/>
+        <source>Select Icon</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>Joystick</name>
     <message>
-        <location filename="../src/VehicleSetup/JoystickConfig.qml" line="338"/>
-        <source>Additional Joystick settings:</source>
+        <location filename="../src/Joystick/Joystick.cc" line="44"/>
+        <source>No Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VehicleSetup/JoystickConfig.qml" line="348"/>
-        <source>Enable joystick input</source>
+        <location filename="../src/Joystick/Joystick.cc" line="45"/>
+        <source>Arm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VehicleSetup/JoystickConfig.qml" line="348"/>
-        <source>Enable not allowed (Calibrate First)</source>
+        <location filename="../src/Joystick/Joystick.cc" line="46"/>
+        <source>Disarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VehicleSetup/JoystickConfig.qml" line="378"/>
-        <source>Active joystick:</source>
+        <location filename="../src/Joystick/Joystick.cc" line="47"/>
+        <source>Toggle Arm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VehicleSetup/JoystickConfig.qml" line="391"/>
-        <source>Active joystick name not in combo</source>
+        <location filename="../src/Joystick/Joystick.cc" line="48"/>
+        <source>VTOL: Fixed Wing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VehicleSetup/JoystickConfig.qml" line="414"/>
-        <source>Center stick is zero throttle</source>
+        <location filename="../src/Joystick/Joystick.cc" line="49"/>
+        <source>VTOL: Multi-Rotor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VehicleSetup/JoystickConfig.qml" line="429"/>
-        <source>Spring loaded throttle smoothing</source>
+        <location filename="../src/Joystick/Joystick.cc" line="50"/>
+        <source>Continuous Zoom In</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VehicleSetup/JoystickConfig.qml" line="436"/>
-        <source>Full down stick is zero throttle</source>
+        <location filename="../src/Joystick/Joystick.cc" line="51"/>
+        <source>Continuous Zoom Out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VehicleSetup/JoystickConfig.qml" line="445"/>
-        <source>Allow negative Thrust</source>
+        <location filename="../src/Joystick/Joystick.cc" line="52"/>
+        <source>Step Zoom In</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VehicleSetup/JoystickConfig.qml" line="457"/>
-        <source>Exponential:</source>
+        <location filename="../src/Joystick/Joystick.cc" line="53"/>
+        <source>Step Zoom Out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VehicleSetup/JoystickConfig.qml" line="480"/>
-        <source>Advanced settings (careful!)</source>
+        <location filename="../src/Joystick/Joystick.cc" line="58"/>
+        <source>Trigger Camera</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VehicleSetup/JoystickConfig.qml" line="497"/>
-        <source>Joystick mode:</source>
+        <location filename="../src/Joystick/Joystick.cc" line="59"/>
+        <source>Start Recording Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VehicleSetup/JoystickConfig.qml" line="515"/>
-        <source>Message frequency (Hz):</source>
+        <location filename="../src/Joystick/Joystick.cc" line="60"/>
+        <source>Stop Recording Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VehicleSetup/JoystickConfig.qml" line="535"/>
-        <source>Enable circle correction</source>
+        <location filename="../src/Joystick/Joystick.cc" line="61"/>
+        <source>Toggle Recording Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VehicleSetup/JoystickConfig.qml" line="552"/>
-        <source>Deadbands</source>
+        <location filename="../src/Joystick/Joystick.cc" line="62"/>
+        <source>Gimbal Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VehicleSetup/JoystickConfig.qml" line="565"/>
-        <source>Deadband can be set during the first </source>
+        <location filename="../src/Joystick/Joystick.cc" line="63"/>
+        <source>Gimbal Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VehicleSetup/JoystickConfig.qml" line="566"/>
-        <source>step of calibration by gently wiggling each axis. </source>
+        <location filename="../src/Joystick/Joystick.cc" line="64"/>
+        <source>Gimbal Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VehicleSetup/JoystickConfig.qml" line="567"/>
-        <source>Deadband can also be adjusted by clicking and </source>
+        <location filename="../src/Joystick/Joystick.cc" line="65"/>
+        <source>Gimbal Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VehicleSetup/JoystickConfig.qml" line="568"/>
-        <source>dragging vertically on the corresponding axis monitor.</source>
+        <location filename="../src/Joystick/Joystick.cc" line="66"/>
+        <source>Gimbal Center</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VehicleSetup/JoystickConfig.qml" line="593"/>
-        <source>Button actions:</source>
+        <location filename="../src/Joystick/Joystick.cc" line="67"/>
+        <source>Emergency Stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VehicleSetup/JoystickConfig.qml" line="652"/>
-        <source>#</source>
+        <location filename="../src/Joystick/Joystick.cc" line="54"/>
+        <source>Next Video Stream</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VehicleSetup/JoystickConfig.qml" line="657"/>
-        <source>Function: </source>
+        <location filename="../src/Joystick/Joystick.cc" line="55"/>
+        <source>Previous Video Stream</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VehicleSetup/JoystickConfig.qml" line="662"/>
-        <source>Shift Function: </source>
+        <location filename="../src/Joystick/Joystick.cc" line="56"/>
+        <source>Next Camera</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VehicleSetup/JoystickConfig.qml" line="774"/>
-        <source>Axis Monitor</source>
+        <location filename="../src/Joystick/Joystick.cc" line="57"/>
+        <source>Previous Camera</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>JoystickConfig</name>
     <message>
-        <location filename="../src/VehicleSetup/JoystickConfig.qml" line="856"/>
-        <source>Button Monitor</source>
+        <location filename="../src/VehicleSetup/JoystickConfig.qml" line="28"/>
+        <source>Joystick</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>JoystickConfigController</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>
+        <location filename="../src/VehicleSetup/JoystickConfig.qml" line="69"/>
+        <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VehicleSetup/JoystickConfigController.cc" line="606"/>
-        <source>Calibrate</source>
+        <location filename="../src/VehicleSetup/JoystickConfig.qml" line="72"/>
+        <source>Button Assigment</source>
         <translation type="unfinished"></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>
+        <location filename="../src/VehicleSetup/JoystickConfig.qml" line="75"/>
+        <source>Calibration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/VehicleSetup/JoystickConfig.qml" line="78"/>
+        <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>JoystickIndicator</name>
+    <name>JoystickConfigAdvanced</name>
     <message>
-        <location filename="../src/ui/toolbar/JoystickIndicator.qml" line="47"/>
-        <source>Joystick Status</source>
+        <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="36"/>
+        <source>Full down stick is zero throttle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/toolbar/JoystickIndicator.qml" line="59"/>
-        <source>Connected:</source>
+        <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="42"/>
+        <source>Center stick is zero throttle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/toolbar/JoystickIndicator.qml" line="64"/>
-        <source>Enabled:</source>
+        <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="49"/>
+        <source>Spring loaded throttle smoothing</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>KMLFileHelper</name>
     <message>
-        <location filename="../src/KMLFileHelper.cc" line="15"/>
-        <source>KML file load failed. %1</source>
+        <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="61"/>
+        <source>Allow negative Thrust</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/KMLFileHelper.cc" line="24"/>
-        <source>File not found: %1</source>
+        <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="73"/>
+        <source>Exponential:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/KMLFileHelper.cc" line="29"/>
-        <source>Unable to open file: %1 error: $%2</source>
+        <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="93"/>
+        <source>Enable further advanced settings (careful!)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/KMLFileHelper.cc" line="37"/>
-        <source>Unable to parse KML file: %1 error: %2 line: %3</source>
+        <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="109"/>
+        <source>Enable gimbal control (Experimental)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/KMLFileHelper.cc" line="61"/>
-        <source>No supported type found in KML file.</source>
+        <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="134"/>
+        <source>Joystick mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/KMLFileHelper.cc" line="77"/>
-        <source>Unable to find Polygon node in KML</source>
+        <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="149"/>
+        <source>Axis frequency (Hz):</source>
         <translation type="unfinished"></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>
+        <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="167"/>
+        <source>Button repeat frequency (Hz):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/KMLFileHelper.cc" line="138"/>
-        <source>Unable to find LineString node in KML</source>
+        <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="185"/>
+        <source>Enable circle correction</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="203"/>
+        <source>Deadbands</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="220"/>
+        <source>Deadband can be set during the first </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="221"/>
+        <source>step of calibration by gently wiggling each axis. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="222"/>
+        <source>Deadband can also be adjusted by clicking and </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="223"/>
+        <source>dragging vertically on the corresponding axis monitor.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>LinechartWidget</name>
+    <name>JoystickConfigButtons</name>
     <message>
-        <location filename="../src/ui/linechart/LinechartWidget.cc" line="106"/>
-        <source>Name</source>
+        <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"></translation>
+    </message>
+    <message>
+        <location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="93"/>
+        <source>Repeat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="123"/>
+        <source>#</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/linechart/LinechartWidget.cc" line="107"/>
-        <source>Val</source>
+        <location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="127"/>
+        <source>Function: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/linechart/LinechartWidget.cc" line="109"/>
-        <source>Unit</source>
+        <location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="131"/>
+        <source>Shift Function: </source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>JoystickConfigCalibration</name>
     <message>
-        <location filename="../src/ui/linechart/LinechartWidget.cc" line="112"/>
-        <source>Mean</source>
+        <location filename="../src/VehicleSetup/JoystickConfigCalibration.qml" line="207"/>
+        <source>Skip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/linechart/LinechartWidget.cc" line="113"/>
-        <source>Variance</source>
+        <location filename="../src/VehicleSetup/JoystickConfigCalibration.qml" line="213"/>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/linechart/LinechartWidget.cc" line="213"/>
-        <source>LOG</source>
+        <location filename="../src/VehicleSetup/JoystickConfigCalibration.qml" line="225"/>
+        <source>Next</source>
         <translation type="unfinished"></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>
+        <location filename="../src/VehicleSetup/JoystickConfigCalibration.qml" line="225"/>
+        <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>JoystickConfigController</name>
     <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>
+        <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"></translation>
     </message>
+</context>
+<context>
+    <name>JoystickConfigGeneral</name>
     <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>
+        <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="38"/>
+        <source>Enable joystick input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/linechart/LinechartWidget.cc" line="234"/>
-        <source>Start Logging</source>
+        <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="38"/>
+        <source>Enable not allowed (Calibrate First)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/linechart/LinechartWidget.cc" line="240"/>
-        <source>Ground Time</source>
+        <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="67"/>
+        <source>Active joystick:</source>
         <translation type="unfinished"></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>
+        <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="79"/>
+        <source>Active joystick name not in combo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/linechart/LinechartWidget.cc" line="249"/>
-        <source>Time axis:</source>
+        <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="97"/>
+        <source>RC Mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/linechart/LinechartWidget.cc" line="253"/>
-        <source>10 seconds</source>
+        <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="151"/>
+        <source>Lateral</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/linechart/LinechartWidget.cc" line="254"/>
-        <source>20 seconds</source>
+        <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="151"/>
+        <source>Roll</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/linechart/LinechartWidget.cc" line="255"/>
-        <source>30 seconds</source>
+        <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="165"/>
+        <source>Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/linechart/LinechartWidget.cc" line="256"/>
-        <source>40 seconds</source>
+        <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="165"/>
+        <source>Pitch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/linechart/LinechartWidget.cc" line="257"/>
-        <source>50 seconds</source>
+        <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="178"/>
+        <source>Yaw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/linechart/LinechartWidget.cc" line="258"/>
-        <source>1 minute</source>
+        <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="191"/>
+        <source>Throttle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/linechart/LinechartWidget.cc" line="259"/>
-        <source>2 minutes</source>
+        <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="214"/>
+        <source>Gimbal Pitch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/linechart/LinechartWidget.cc" line="260"/>
-        <source>3 minutes</source>
+        <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="229"/>
+        <source>Gimbal Yaw</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>JoystickIndicator</name>
     <message>
-        <location filename="../src/ui/linechart/LinechartWidget.cc" line="261"/>
-        <source>4 minutes</source>
+        <location filename="../src/ui/toolbar/JoystickIndicator.qml" line="47"/>
+        <source>Joystick Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/linechart/LinechartWidget.cc" line="262"/>
-        <source>5 minutes</source>
+        <location filename="../src/ui/toolbar/JoystickIndicator.qml" line="59"/>
+        <source>Connected:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/linechart/LinechartWidget.cc" line="263"/>
-        <source>10 minutes</source>
+        <location filename="../src/ui/toolbar/JoystickIndicator.qml" line="64"/>
+        <source>Enabled:</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>JsonHelper</name>
     <message>
-        <location filename="../src/ui/linechart/LinechartWidget.cc" line="431"/>
-        <source>No curves selected for logging.</source>
+        <location filename="../src/JsonHelper.cc" line="369"/>
+        <source>Unable to open file: &apos;%1&apos;, error: %2</source>
         <translation type="unfinished"></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>
+        <location filename="../src/JsonHelper.cc" line="378"/>
+        <source>Unable to parse json file: %1 error: %2 offset: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/linechart/LinechartWidget.cc" line="440"/>
-        <source>Save Log File</source>
+        <location filename="../src/JsonHelper.cc" line="383"/>
+        <source>Root of json file is not object: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/linechart/LinechartWidget.cc" line="442"/>
-        <source>Log Files (*.log)</source>
+        <location filename="../src/JsonHelper.cc" line="390"/>
+        <source>Json file: &apos;%1&apos;. %2</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>KMLHelper</name>
     <message>
-        <location filename="../src/ui/linechart/LinechartWidget.cc" line="454"/>
-        <source>Stop logging</source>
+        <location filename="../src/KMLHelper.cc" line="15"/>
+        <source>KML file load failed. %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/linechart/LinechartWidget.cc" line="473"/>
-        <source>Starting Log Compression</source>
+        <location filename="../src/KMLHelper.cc" line="24"/>
+        <source>File not found: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
+        <location filename="../src/KMLHelper.cc" line="29"/>
+        <source>Unable to open file: %1 error: $%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/linechart/LinechartWidget.cc" line="481"/>
-        <source>Start logging</source>
+        <location filename="../src/KMLHelper.cc" line="37"/>
+        <source>Unable to parse KML file: %1 error: %2 line: %3</source>
         <translation type="unfinished"></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>
+        <location filename="../src/KMLHelper.cc" line="61"/>
+        <source>No supported type found in KML file.</source>
         <translation type="unfinished"></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>
+        <location filename="../src/KMLHelper.cc" line="77"/>
+        <source>Unable to find Polygon node in KML</source>
         <translation type="unfinished"></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>
+        <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"></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>
+        <location filename="../src/KMLHelper.cc" line="138"/>
+        <source>Unable to find LineString node in KML</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>KMLOrSHPFileDialog</name>
     <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>
+        <location filename="../src/QmlControls/KMLOrSHPFileDialog.qml" line="19"/>
+        <source>Select Polygon File</source>
         <translation type="unfinished"></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"></translation>
@@ -7759,50 +8465,51 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
         <translation type="unfinished"></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"></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"></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"></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"></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"></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"></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"></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"></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"></translation>
     </message>
@@ -7810,82 +8517,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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></translation>
     </message>
@@ -7922,34 +8629,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"></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"></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"></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"></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"></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"></translation>
     </message>
@@ -8012,27 +8719,27 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
         <translation type="unfinished"></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"></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"></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"></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"></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"></translation>
     </message>
@@ -8050,29 +8757,28 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
         <translation type="unfinished"></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"></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"></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>
+        <location filename="../src/comm/LogReplayLink.cc" line="292"/>
+        <source>The log file &apos;%1&apos; is corrupt or empty.</source>
         <translation type="unfinished"></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"></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"></translation>
     </message>
@@ -8080,11 +8786,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"></translation>
     </message>
 </context>
+<context>
+    <name>LogReplayLinkController</name>
+    <message>
+        <location filename="../src/comm/LogReplayLink.cc" line="600"/>
+        <source>%2m:%3s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/comm/LogReplayLink.cc" line="602"/>
+        <source>%1h:%2m:%3s</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>LogReplaySettings</name>
     <message>
@@ -8104,229 +8823,400 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
     </message>
 </context>
 <context>
-    <name>MAVLinkInspectorController</name>
+    <name>LogReplayStatusBar</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"/>
-        <source>Vehicle %1</source>
+        <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="19"/>
+        <source>Log Replay</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MAVLinkInspectorPage</name>
     <message>
-        <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="40"/>
-        <source>Inspect real time MAVLink messages.</source>
+        <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="19"/>
+        <source>You must close all connections prior to replaying a log.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="89"/>
-        <source>Message:</source>
+        <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="30"/>
+        <source>Select Telemetery Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="97"/>
-        <source>Component:</source>
+        <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="31"/>
+        <source>Telemetry Logs (*.%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="103"/>
-        <source>Count:</source>
+        <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="31"/>
+        <source>All Files (*)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="54"/>
+        <source>Pause</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="54"/>
+        <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="111"/>
-        <source>Message Fields:</source>
+        <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="102"/>
+        <source>Load Telemetry Log</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MAVLinkProtocol</name>
+    <name>MAVLinkChart</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"/>
-        <source>MAVLink Protocol</source>
+        <location filename="../src/QmlControls/MAVLinkChart.qml" line="91"/>
+        <source>Scale:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/comm/MAVLinkProtocol.cc" line="261"/>
-        <source>MAVLink Logging failed. Could not write to file %1, logging disabled.</source>
+        <location filename="../src/QmlControls/MAVLinkChart.qml" line="104"/>
+        <source>Range:</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MAVLinkInspectorController</name>
     <message>
-        <location filename="../src/comm/MAVLinkProtocol.cc" line="301"/>
-        <source>Detected radio still using MAVLink v1.0 on a link with MAVLink v2.0 enabled. Please upgrade the radio firmware.</source>
+        <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="729"/>
+        <source>5 Sec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/comm/MAVLinkProtocol.cc" line="348"/>
-        <source>MAVLink protocol</source>
+        <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="730"/>
+        <source>10 Sec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/comm/MAVLinkProtocol.cc" line="422"/>
-        <source>Opening Flight Data file for writing failed. Unable to write to %1. Please choose a different file location.</source>
+        <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="731"/>
+        <source>30 Sec</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MainRootWindow</name>
     <message>
-        <location filename="../src/ui/MainRootWindow.qml" line="213"/>
-        <location filename="../src/ui/MainRootWindow.qml" line="240"/>
-        <source>%1 close</source>
+        <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="732"/>
+        <source>60 Sec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/MainRootWindow.qml" line="214"/>
-        <source>There are still active connections to vehicles. Are you sure you want to exit?</source>
+        <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="734"/>
+        <source>Auto</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/MainRootWindow.qml" line="241"/>
-        <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>
+        <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="735"/>
+        <source>10,000</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/MainRootWindow.qml" line="364"/>
-        <source>No Messages</source>
+        <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="736"/>
+        <source>1,000</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/MainRootWindow.qml" line="471"/>
-        <source>Parameters missing: %1</source>
+        <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="737"/>
+        <source>100</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/MainRootWindow.qml" line="475"/>
-        <source>Fact error: %1</source>
+        <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="738"/>
+        <source>10</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MainToolBar</name>
     <message>
-        <location filename="../src/ui/toolbar/MainToolBar.qml" line="179"/>
-        <source>Downloading Parameters</source>
+        <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="739"/>
+        <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/toolbar/MainToolBar.qml" line="187"/>
-        <source>Click anywhere to hide</source>
+        <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="740"/>
+        <source>0.1</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MainToolBarIndicators</name>
     <message>
-        <location filename="../src/ui/toolbar/MainToolBarIndicators.qml" line="52"/>
-        <source>Advanced Mode</source>
+        <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="741"/>
+        <source>0.01</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/toolbar/MainToolBarIndicators.qml" line="67"/>
-        <source>Waiting For Vehicle Connection</source>
+        <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="742"/>
+        <source>0.001</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/toolbar/MainToolBarIndicators.qml" line="141"/>
-        <source>Disconnect</source>
+        <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="743"/>
+        <source>0.0001</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/toolbar/MainToolBarIndicators.qml" line="149"/>
-        <source>COMMUNICATION LOST</source>
+        <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"></translation>
     </message>
 </context>
 <context>
-    <name>MapScale</name>
+    <name>MAVLinkInspectorPage</name>
     <message>
-        <location filename="../src/FlightMap/MapScale.qml" line="40"/>
-        <source> km</source>
+        <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="44"/>
+        <source>Inspect real time MAVLink messages.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FlightMap/MapScale.qml" line="42"/>
-        <source> m</source>
+        <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="50"/>
+        <source>Component ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FlightMap/MapScale.qml" line="53"/>
-        <source> mile</source>
+        <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="123"/>
+        <source>Message:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FlightMap/MapScale.qml" line="55"/>
-        <source> miles</source>
+        <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="131"/>
+        <source>Component:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FlightMap/MapScale.qml" line="58"/>
-        <source> ft</source>
+        <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="137"/>
+        <source>Count:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MavlinkConsolePage</name>
     <message>
-        <location filename="../src/AnalyzeView/MavlinkConsolePage.qml" line="26"/>
-        <source>Mavlink Console</source>
+        <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="152"/>
+        <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/AnalyzeView/MavlinkConsolePage.qml" line="27"/>
-        <source>Mavlink Console provides a connection to the vehicle&apos;s system shell.</source>
+        <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="155"/>
+        <source>Value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/AnalyzeView/MavlinkConsolePage.qml" line="118"/>
-        <source>Send</source>
+        <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="158"/>
+        <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/AnalyzeView/MavlinkConsolePage.qml" line="126"/>
-        <source>Show Latest</source>
+        <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="161"/>
+        <source>Plot 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="164"/>
+        <source>Plot 2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MavlinkSettings</name>
+    <name>MAVLinkProtocol</name>
     <message>
-        <location filename="../src/ui/preferences/MavlinkSettings.qml" line="82"/>
-        <source>MAVLink Logging</source>
+        <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"></translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences/MavlinkSettings.qml" line="83"/>
-        <source>Please enter an email address before uploading MAVLink log files.</source>
+        <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"></translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences/MavlinkSettings.qml" line="108"/>
-        <source>Ground Station</source>
+        <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"></translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences/MavlinkSettings.qml" line="127"/>
-        <source>MAVLink System ID:</source>
+        <location filename="../src/comm/MAVLinkProtocol.cc" line="386"/>
+        <source>MAVLink protocol</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences/MavlinkSettings.qml" line="142"/>
-        <source>Emit heartbeat</source>
+        <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"></translation>
     </message>
+</context>
+<context>
+    <name>MainRootWindow</name>
     <message>
-        <location filename="../src/ui/preferences/MavlinkSettings.qml" line="150"/>
-        <source>Only accept MAVs with same protocol version</source>
+        <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"></translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences/MavlinkSettings.qml" line="169"/>
-        <source>Telemetry Stream Rates (ArduPilot Only)</source>
+        <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"></translation>
+    </message>
+    <message>
+        <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"></translation>
+    </message>
+    <message>
+        <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"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/MainRootWindow.qml" line="457"/>
+        <source>No Messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/MainRootWindow.qml" line="564"/>
+        <source>Parameters missing: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/MainRootWindow.qml" line="568"/>
+        <source>Fact error: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainToolBar</name>
+    <message>
+        <location filename="../src/ui/toolbar/MainToolBar.qml" line="181"/>
+        <source>Advanced Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/toolbar/MainToolBar.qml" line="337"/>
+        <source>Downloading Parameters</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/toolbar/MainToolBar.qml" line="345"/>
+        <source>Click anywhere to hide</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/toolbar/MainToolBar.qml" line="362"/>
+        <source>Waiting For Vehicle Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/toolbar/MainToolBar.qml" line="384"/>
+        <source>Disconnect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/toolbar/MainToolBar.qml" line="392"/>
+        <source>COMMUNICATION LOST</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MapScale</name>
+    <message>
+        <location filename="../src/FlightMap/MapScale.qml" line="46"/>
+        <source> km</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightMap/MapScale.qml" line="48"/>
+        <source> m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightMap/MapScale.qml" line="59"/>
+        <source> mile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightMap/MapScale.qml" line="61"/>
+        <source> miles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightMap/MapScale.qml" line="64"/>
+        <source> ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightMap/MapScale.qml" line="193"/>
+        <source>T</source>
+        <translation type="unfinished"></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>
+    <message>
+        <location filename="../src/AnalyzeView/MavlinkConsolePage.qml" line="26"/>
+        <source>Mavlink Console</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/AnalyzeView/MavlinkConsolePage.qml" line="27"/>
+        <source>Mavlink Console provides a connection to the vehicle&apos;s system shell.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/AnalyzeView/MavlinkConsolePage.qml" line="118"/>
+        <source>Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/AnalyzeView/MavlinkConsolePage.qml" line="126"/>
+        <source>Show Latest</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MavlinkSettings</name>
+    <message>
+        <location filename="../src/ui/preferences/MavlinkSettings.qml" line="82"/>
+        <source>MAVLink Logging</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/preferences/MavlinkSettings.qml" line="83"/>
+        <source>Please enter an email address before uploading MAVLink log files.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/preferences/MavlinkSettings.qml" line="108"/>
+        <source>Ground Station</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/preferences/MavlinkSettings.qml" line="127"/>
+        <source>MAVLink System ID:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/preferences/MavlinkSettings.qml" line="142"/>
+        <source>Emit heartbeat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/preferences/MavlinkSettings.qml" line="150"/>
+        <source>Only accept MAVs with same protocol version</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/preferences/MavlinkSettings.qml" line="169"/>
+        <source>Telemetry Stream Rates (ArduPilot Only)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8458,92 +9348,92 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
         <translation type="unfinished"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></translation>
     </message>
@@ -8571,64 +9461,75 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
         <translation type="unfinished"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></translation>
     </message>
     <message>
-        <location filename="../src/Microhard/MicrohardSettings.qml" line="213"/>
-        <source>Configuration password:</source>
+        <location filename="../src/Microhard/MicrohardSettings.qml" line="229"/>
+        <source>Configuration User Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/Microhard/MicrohardSettings.qml" line="238"/>
+        <source>Configuration Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Microhard/MicrohardSettings.qml" line="223"/>
+        <location filename="../src/Microhard/MicrohardSettings.qml" line="248"/>
         <source>Encryption key:</source>
         <translation type="unfinished"></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"></translation>
     </message>
@@ -8636,7 +9537,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"></translation>
     </message>
@@ -8644,7 +9545,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"></translation>
     </message>
@@ -8652,64 +9553,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"></translation>
-    </message>
-    <message>
-        <location filename="../src/MissionManager/MissionController.cc" line="55"/>
-        <source>Structure Scan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/MissionManager/MissionController.cc" line="56"/>
-        <source>Corridor Scan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/MissionManager/MissionController.cc" line="67"/>
-        <source>Survey</source>
-        <translation type="unfinished"></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"></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"></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"></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"></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"></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"></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"></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"></translation>
     </message>
@@ -8735,57 +9611,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"></translation>
-    </message>
-    <message>
-        <location filename="../src/PlanView/MissionItemEditor.qml" line="113"/>
-        <source>Insert pattern</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/PlanView/MissionItemEditor.qml" line="130"/>
-        <source>Insert </source>
+        <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>
+        <location filename="../src/PlanView/MissionItemEditor.qml" line="206"/>
+        <source>Move to vehicle position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/PlanView/MissionItemEditor.qml" line="141"/>
-        <source>Change command...</source>
+        <location filename="../src/PlanView/MissionItemEditor.qml" line="213"/>
+        <source>Move to previous item position</source>
         <translation type="unfinished"></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"></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"></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"></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"></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"></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"></translation>
+    </message>
+    <message>
+        <location filename="../src/PlanView/MissionItemEditor.qml" line="156"/>
         <source>Select Mission Command</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8793,7 +9665,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"></translation>
     </message>
@@ -8834,68 +9706,58 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/PlanView/MissionSettingsEditor.qml" line="112"/>
-        <source>Mission End</source>
+        <location filename="../src/PlanView/MissionSettingsEditor.qml" line="180"/>
+        <source>Launch Position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/PlanView/MissionSettingsEditor.qml" line="123"/>
-        <source>Return To Launch</source>
+        <location filename="../src/PlanView/MissionSettingsEditor.qml" line="216"/>
+        <source>Set To Map Center</source>
         <translation type="unfinished"></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"></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"></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"></translation>
     </message>
     <message>
-        <location filename="../src/PlanView/MissionSettingsEditor.qml" line="196"/>
-        <source>Planned Home Position</source>
-        <translation type="unfinished"></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"></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"></translation>
     </message>
-    <message>
-        <location filename="../src/PlanView/MissionSettingsEditor.qml" line="232"/>
-        <source>Set Home To Map Center</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>MissionSettingsItem</name>
     <message>
-        <location filename="../src/MissionManager/MissionSettingsItem.cc" line="304"/>
-        <source>H</source>
+        <location filename="../src/MissionManager/MissionSettingsItem.cc" line="294"/>
+        <source>L</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MissionManager/MissionSettingsItem.cc" line="304"/>
-        <source>Planned Home</source>
+        <location filename="../src/MissionManager/MissionSettingsItem.cc" line="294"/>
+        <source>Launch</source>
         <translation type="unfinished"></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"></translation>
     </message>
@@ -8903,42 +9765,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"></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"></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"></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"></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"></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"></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"></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"></translation>
     </message>
@@ -8981,15 +9843,6 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
         <translation type="unfinished"></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"></translation>
-    </message>
-</context>
 <context>
     <name>ModeSwitchDisplay</name>
     <message>
@@ -9006,20 +9859,30 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
 <context>
     <name>MotorComponent</name>
     <message>
-        <location filename="../src/AutoPilotPlugins/Common/MotorComponent.qml" line="81"/>
+        <location filename="../src/AutoPilotPlugins/Common/MotorComponent.qml" line="39"/>
+        <source>Warning: Unable to determine motor count</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/AutoPilotPlugins/Common/MotorComponent.qml" line="96"/>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/AutoPilotPlugins/Common/MotorComponent.qml" line="114"/>
+        <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"></translation>
     </message>
     <message>
-        <location filename="../src/AutoPilotPlugins/Common/MotorComponent.qml" line="134"/>
+        <location filename="../src/AutoPilotPlugins/Common/MotorComponent.qml" line="142"/>
         <source>Propellers are removed - Enable motor sliders</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../src/AutoPilotPlugins/Common/MotorComponent.qml" line="142"/>
+        <source>Careful: Motor sliders are enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../src/AutoPilotPlugins/Common/MotorComponent.cc" line="14"/>
         <source>Motors</source>
@@ -9032,178 +9895,269 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
     </message>
 </context>
 <context>
-    <name>MultiVehicleDockWidget</name>
+    <name>MultiRotorChecklist</name>
     <message>
-        <location filename="../src/ui/MultiVehicleDockWidget.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="25"/>
+        <source>Multirotor Initial Checks</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MultiVehicleList</name>
     <message>
-        <location filename="../src/FlightDisplay/MultiVehicleList.qml" line="55"/>
-        <source>The following commands will be applied to all vehicles</source>
+        <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="28"/>
+        <source>Hardware</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FlightDisplay/MultiVehicleList.qml" line="131"/>
-        <source>Armed</source>
+        <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="29"/>
+        <source>Props mounted and secured?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FlightDisplay/MultiVehicleList.qml" line="131"/>
-        <source>Disarmed</source>
+        <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="50"/>
+        <source>Please arm the vehicle here</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MultiVehicleManager</name>
     <message>
-        <location filename="../src/Vehicle/MultiVehicleManager.cc" line="126"/>
-        <source>Warning: A vehicle is using the same system id as %1: %2</source>
+        <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="53"/>
+        <source>Motors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Vehicle/MultiVehicleManager.cc" line="144"/>
-        <source>Connected to Vehicle %1</source>
+        <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="54"/>
+        <source>Propellers free? Then throttle up gently. Working properly?</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>OfflineMap</name>
     <message>
-        <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="240"/>
-        <source>Error Message</source>
+        <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="58"/>
+        <source>Mission</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="270"/>
-        <source>Max Cache Disk Size (MB):</source>
+        <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="59"/>
+        <source>Please confirm mission is valid (waypoints valid, no terrain collision).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="286"/>
-        <source>Max Cache Memory Size (MB):</source>
+        <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="67"/>
+        <source>Last preparations before launch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="302"/>
-        <source>Memory cache changes require a restart to take effect.</source>
+        <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="71"/>
+        <source>Payload</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="306"/>
-        <source>Mapbox Access Token</source>
+        <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="72"/>
+        <source>Configured and started? Payload lid closed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="317"/>
-        <source>To enable Mapbox maps, enter your access token.</source>
+        <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="76"/>
+        <source>Wind &amp; weather</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="323"/>
-        <source>Esri Access Token</source>
+        <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="77"/>
+        <source>OK for your platform?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="334"/>
-        <source>To enable Esri maps, enter your access token.</source>
+        <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="81"/>
+        <source>Flight area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="349"/>
-        <source>This will delete all tiles INCLUDING the tile sets you have created yourself.
-
-Is this really what you want?</source>
+        <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="82"/>
+        <source>Launch area and path free of obstacles/people?</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MultiVehicleList</name>
     <message>
-        <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="351"/>
-        <source>Delete %1 and all its tiles.
-
-Is this really what you want?</source>
+        <location filename="../src/FlightDisplay/MultiVehicleList.qml" line="55"/>
+        <source>The following commands will be applied to all vehicles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="455"/>
-        <source>System Wide Tile Cache</source>
+        <location filename="../src/FlightDisplay/MultiVehicleList.qml" line="131"/>
+        <source>Armed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="468"/>
-        <source>Zoom Levels:</source>
+        <location filename="../src/FlightDisplay/MultiVehicleList.qml" line="131"/>
+        <source>Disarmed</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MultiVehicleManager</name>
     <message>
-        <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="475"/>
-        <source>Total:</source>
+        <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"></translation>
+    </message>
+    <message>
+        <location filename="../src/Vehicle/MultiVehicleManager.cc" line="143"/>
+        <source>Connected to Vehicle %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MultiVehiclePanel</name>
+    <message>
+        <location filename="../src/FlightDisplay/MultiVehiclePanel.qml" line="38"/>
+        <source>Single</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightDisplay/MultiVehiclePanel.qml" line="44"/>
+        <source>Multi-Vehicle</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MultiVehicleSelector</name>
+    <message>
+        <location filename="../src/ui/toolbar/MultiVehicleSelector.qml" line="48"/>
+        <source>Vehicle</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OfflineMap</name>
+    <message>
+        <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="238"/>
+        <source>Error Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="268"/>
+        <source>Max Cache Disk Size (MB):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="284"/>
+        <source>Max Cache Memory Size (MB):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="300"/>
+        <source>Memory cache changes require a restart to take effect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="304"/>
+        <source>Mapbox Access Token</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="315"/>
+        <source>To enable Mapbox maps, enter your access token.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="321"/>
+        <source>Esri Access Token</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="332"/>
+        <source>To enable Esri maps, enter your access token.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="349"/>
+        <source>Delete %1 and all its tiles.
+
+Is this really what you want?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="454"/>
+        <source>System Wide Tile Cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="467"/>
+        <source>Zoom Levels:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="474"/>
+        <source>Total:</source>
         <translation type="unfinished"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></translation>
     </message>
@@ -9213,134 +10167,167 @@ Is this really what you want?</source>
         <translation type="unfinished"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></translation>
     </message>
 </context>
+<context>
+    <name>OfflineVehicleFirstRunPrompt</name>
+    <message>
+        <location filename="../src/FirstRunPromptDialogs/OfflineVehicleFirstRunPrompt.qml" line="21"/>
+        <source>Vehicle Information</source>
+        <translation type="unfinished"></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"></translation>
+    </message>
+    <message>
+        <location filename="../src/FirstRunPromptDialogs/OfflineVehicleFirstRunPrompt.qml" line="59"/>
+        <source>Firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FirstRunPromptDialogs/OfflineVehicleFirstRunPrompt.qml" line="71"/>
+        <source>Vehicle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FirstRunPromptDialogs/OfflineVehicleFirstRunPrompt.qml" line="83"/>
+        <source>Mission Cruise Speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FirstRunPromptDialogs/OfflineVehicleFirstRunPrompt.qml" line="94"/>
+        <source>Mission Hover Speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>PIDTuning</name>
     <message>
@@ -9359,57 +10346,57 @@ Is this really what you want?</source>
         <translation type="unfinished"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></translation>
     </message>
@@ -9655,7 +10642,7 @@ Is this really what you want?</source>
     <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>
+        <source>The vehicle returns to the launch position, loiters and then lands. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9692,19 +10679,19 @@ Is this really what you want?</source>
 <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"></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"></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"></translation>
@@ -9713,7 +10700,7 @@ Is this really what you want?</source>
 <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"></translation>
     </message>
@@ -9721,132 +10708,132 @@ Is this really what you want?</source>
 <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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></translation>
     </message>
     <message>
-        <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="490"/>
-        <source>Unable to start mission: Vehicle not ready.</source>
+        <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"></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"></translation>
     </message>
@@ -9921,12 +10908,12 @@ Is this really what you want?</source>
 <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"></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"></translation>
     </message>
@@ -10020,20 +11007,20 @@ Is this really what you want?</source>
         <translation type="unfinished"></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>
+        <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"></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"></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"></translation>
     </message>
@@ -10054,44 +11041,44 @@ Is this really what you want?</source>
 <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"></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"></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"></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"></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"></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"></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"></translation>
     </message>
@@ -10099,32 +11086,32 @@ Is this really what you want?</source>
 <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"></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"></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"></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"></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"></translation>
     </message>
@@ -10204,6 +11191,85 @@ Is this really what you want?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PairingManager</name>
+    <message>
+        <location filename="../src/PairingManager/PairingManager.cc" line="80"/>
+        <source>Pairing Successfull</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/PairingManager/PairingManager.cc" line="90"/>
+        <source>Connection Successfull</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/PairingManager/PairingManager.cc" line="151"/>
+        <source>Connection Rejected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/PairingManager/PairingManager.cc" line="154"/>
+        <source>Pairing Rejected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/PairingManager/PairingManager.cc" line="162"/>
+        <source>No Response From Vehicle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/PairingManager/PairingManager.cc" line="191"/>
+        <source>Connecting to %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/PairingManager/PairingManager.cc" line="252"/>
+        <source>Invalid Pairing File</source>
+        <translation type="unfinished"></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"></translation>
+    </message>
+    <message>
+        <location filename="../src/PairingManager/PairingManager.cc" line="461"/>
+        <source>NFC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/PairingManager/PairingManager.cc" line="465"/>
+        <source>Microhard</source>
+        <translation type="unfinished"></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"></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"></translation>
+    </message>
+    <message>
+        <location filename="../src/PairingManager/QtNFC.cc" line="78"/>
+        <source>Device detected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/PairingManager/QtNFC.cc" line="114"/>
+        <source>Device removed</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ParameterEditor</name>
     <message>
@@ -10212,74 +11278,81 @@ Is this really what you want?</source>
         <translation type="unfinished"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></translation>
     </message>
     <message>
-        <location filename="../src/QmlControls/ParameterEditor.qml" line="139"/>
-        <source>Clear RC to Param</source>
+        <location filename="../src/QmlControls/ParameterEditor.qml" line="137"/>
+        <source>Clear all RC to Param</source>
+        <translation type="unfinished"></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"></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"></translation>
     </message>
@@ -10298,11 +11371,6 @@ Is this really what you want?</source>
         <source>All Files (*.*)</source>
         <translation type="unfinished"></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"></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>
@@ -10317,22 +11385,12 @@ Is this really what you want?</source>
 <context>
     <name>ParameterEditorController</name>
     <message>
-        <location filename="../src/QmlControls/ParameterEditorController.cc" line="26"/>
-        <source>Component </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/QmlControls/ParameterEditorController.cc" line="63"/>
-        <source>All</source>
-        <translation type="unfinished"></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"></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"></translation>
     </message>
@@ -10340,90 +11398,116 @@ Is this really what you want?</source>
 <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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></translation>
     </message>
     <message>
-        <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="289"/>
-        <source>Set RC to Param...</source>
+        <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="290"/>
+        <source>Set RC to Param</source>
         <translation type="unfinished"></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"></translation>
+    </message>
+    <message>
+        <location filename="../src/FactSystem/ParameterManager.cc" line="670"/>
+        <source>Component %1  (%2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FactSystem/ParameterManager.cc" line="672"/>
+        <source>Component </source>
+        <translation type="unfinished"></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"></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"></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"></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"></translation>
+    </message>
+    <message>
+        <location filename="../src/FactSystem/ParameterManager.cc" line="1087"/>
+        <source>Parameters not loaded due to type mismatch: %1</source>
+        <translation type="unfinished"></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"></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"></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"></translation>
     </message>
@@ -10431,208 +11515,222 @@ Is this really what you want?</source>
 <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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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>
+        <location filename="../src/MissionManager/PlanManager.cc" line="662"/>
+        <source>Vehicle remove all failed. Error: %1</source>
         <translation type="unfinished"></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>
+        <location filename="../src/MissionManager/PlanManager.cc" line="744"/>
+        <source>Item #%1 Command: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MissionManager/PlanManager.cc" line="645"/>
-        <source>Vehicle returned error: %1. Vehicle remove all failed.</source>
+        <location filename="../src/MissionManager/PlanManager.cc" line="748"/>
+        <source>Frame: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MissionManager/PlanManager.cc" line="655"/>
-        <source>Vehicle returned error: %1. %2Vehicle did not accept guided item.</source>
+        <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"></translation>
+    </message>
+    <message>
+        <location filename="../src/MissionManager/PlanManager.cc" line="791"/>
+        <source>Mission accepted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MissionManager/PlanManager.cc" line="768"/>
-        <source>Mission accepted (MAV_MISSION_ACCEPTED)</source>
+        <location filename="../src/MissionManager/PlanManager.cc" line="794"/>
+        <source>Unspecified error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MissionManager/PlanManager.cc" line="771"/>
-        <source>Unspecified error (MAV_MISSION_ERROR)</source>
+        <location filename="../src/MissionManager/PlanManager.cc" line="797"/>
+        <source>Coordinate frame is not supported.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MissionManager/PlanManager.cc" line="774"/>
-        <source>Coordinate frame is not supported (MAV_MISSION_UNSUPPORTED_FRAME)</source>
+        <location filename="../src/MissionManager/PlanManager.cc" line="800"/>
+        <source>Command is not supported.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MissionManager/PlanManager.cc" line="777"/>
-        <source>Command is not supported (MAV_MISSION_UNSUPPORTED)</source>
+        <location filename="../src/MissionManager/PlanManager.cc" line="803"/>
+        <source>Mission item exceeds storage space.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MissionManager/PlanManager.cc" line="780"/>
-        <source>Mission item exceeds storage space (MAV_MISSION_NO_SPACE)</source>
+        <location filename="../src/MissionManager/PlanManager.cc" line="806"/>
+        <source>One of the parameters has an invalid value.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MissionManager/PlanManager.cc" line="783"/>
-        <source>One of the parameters has an invalid value (MAV_MISSION_INVALID)</source>
+        <location filename="../src/MissionManager/PlanManager.cc" line="809"/>
+        <source>Param 1 invalid value.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MissionManager/PlanManager.cc" line="786"/>
-        <source>Param1 has an invalid value (MAV_MISSION_INVALID_PARAM1)</source>
+        <location filename="../src/MissionManager/PlanManager.cc" line="812"/>
+        <source>Param 2 invalid value.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MissionManager/PlanManager.cc" line="789"/>
-        <source>Param2 has an invalid value (MAV_MISSION_INVALID_PARAM2)</source>
+        <location filename="../src/MissionManager/PlanManager.cc" line="815"/>
+        <source>Param 3 invalid value.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MissionManager/PlanManager.cc" line="792"/>
-        <source>Param3 has an invalid value (MAV_MISSION_INVALID_PARAM3)</source>
+        <location filename="../src/MissionManager/PlanManager.cc" line="818"/>
+        <source>Param 4 invalid value.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MissionManager/PlanManager.cc" line="795"/>
-        <source>Param4 has an invalid value (MAV_MISSION_INVALID_PARAM4)</source>
+        <location filename="../src/MissionManager/PlanManager.cc" line="821"/>
+        <source>Param 5 invalid value.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MissionManager/PlanManager.cc" line="798"/>
-        <source>X/Param5 has an invalid value (MAV_MISSION_INVALID_PARAM5_X)</source>
+        <location filename="../src/MissionManager/PlanManager.cc" line="824"/>
+        <source>Param 6 invalid value.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MissionManager/PlanManager.cc" line="801"/>
-        <source>Y/Param6 has an invalid value (MAV_MISSION_INVALID_PARAM6_Y)</source>
+        <location filename="../src/MissionManager/PlanManager.cc" line="827"/>
+        <source>Param 7 invalid value.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MissionManager/PlanManager.cc" line="804"/>
-        <source>Param7 has an invalid value (MAV_MISSION_INVALID_PARAM7)</source>
+        <location filename="../src/MissionManager/PlanManager.cc" line="830"/>
+        <source>Received mission item out of sequence.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MissionManager/PlanManager.cc" line="807"/>
-        <source>Received mission item out of sequence (MAV_MISSION_INVALID_SEQUENCE)</source>
+        <location filename="../src/MissionManager/PlanManager.cc" line="833"/>
+        <source>Not accepting any mission commands.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MissionManager/PlanManager.cc" line="810"/>
-        <source>Not accepting any mission commands (MAV_MISSION_DENIED)</source>
+        <location filename="../src/MissionManager/PlanManager.cc" line="837"/>
+        <source>Unknown error: %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MissionManager/PlanManager.cc" line="814"/>
-        <source>QGC Internal Error</source>
+        <location filename="../src/MissionManager/PlanManager.cc" line="673"/>
+        <source>Vehicle returned error: %1. %2Vehicle did not accept guided item.</source>
         <translation type="unfinished"></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"></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"></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"></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"></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"></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"></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"></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"></translation>
     </message>
@@ -10640,78 +11738,78 @@ Is this really what you want?</source>
 <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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></translation>
     </message>
@@ -10754,234 +11852,225 @@ Is this really what you want?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/PlanView/PlanView.qml" line="189"/>
-        <source>Unable to Save/Upload</source>
-        <translation type="unfinished"></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"></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"></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"></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"></translation>
     </message>
     <message>
-        <location filename="../src/PlanView/PlanView.qml" line="233"/>
-        <source>Load Shape</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/PlanView/PlanView.qml" line="247"/>
-        <source>Save KML</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/PlanView/PlanView.qml" line="355"/>
-        <source>Create which pattern type?</source>
+        <location filename="../src/PlanView/PlanView.qml" line="251"/>
+        <source>Save KML</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/PlanView/PlanView.qml" line="359"/>
-        <source>Survey</source>
+        <source>Move the selected mission item to the be after following mission item:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/PlanView/PlanView.qml" line="363"/>
-        <source>Structure Scan</source>
+        <location filename="../src/PlanView/PlanView.qml" line="594"/>
+        <source>File</source>
         <translation type="unfinished"></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>
+        <location filename="../src/PlanView/PlanView.qml" line="613"/>
+        <source>Waypoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/PlanView/PlanView.qml" line="551"/>
-        <source>Fly</source>
+        <location filename="../src/PlanView/PlanView.qml" line="623"/>
+        <source>ROI</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/PlanView/PlanView.qml" line="555"/>
-        <source>File</source>
+        <location filename="../src/PlanView/PlanView.qml" line="639"/>
+        <source>Pattern</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/PlanView/PlanView.qml" line="561"/>
-        <source>Waypoint</source>
+        <location filename="../src/PlanView/PlanView.qml" line="662"/>
+        <source>Center</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/PlanView/PlanView.qml" line="566"/>
-        <source>ROI</source>
+        <location filename="../src/PlanView/PlanView.qml" line="576"/>
+        <location filename="../src/PlanView/PlanView.qml" line="739"/>
+        <source>Plan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/PlanView/PlanView.qml" line="571"/>
-        <source>Pattern</source>
+        <location filename="../src/PlanView/PlanView.qml" line="603"/>
+        <source>Takeoff</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/PlanView/PlanView.qml" line="576"/>
-        <source>Center</source>
+        <location filename="../src/PlanView/PlanView.qml" line="613"/>
+        <source>Rally Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/PlanView/PlanView.qml" line="581"/>
-        <source>In</source>
+        <location filename="../src/PlanView/PlanView.qml" line="623"/>
+        <source>Cancel ROI</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/PlanView/PlanView.qml" line="585"/>
-        <source>Out</source>
+        <location filename="../src/PlanView/PlanView.qml" line="652"/>
+        <source>Return</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/PlanView/PlanView.qml" line="673"/>
-        <location filename="../src/PlanView/PlanView.qml" line="724"/>
-        <source>Plan</source>
+        <location filename="../src/PlanView/PlanView.qml" line="652"/>
+        <source>Land</source>
         <translation type="unfinished"></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"></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"></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"></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"></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"></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>
+        <location filename="../src/PlanView/PlanView.qml" line="1182"/>
+        <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/PlanView/PlanView.qml" line="881"/>
-        <source>This will also remove all items from the vehicle.</source>
+        <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"></translation>
     </message>
     <message>
-        <location filename="../src/PlanView/PlanView.qml" line="896"/>
-        <source>Are you sure you want to remove all mission items and clear the mission from the vehicle?</source>
+        <location filename="../src/PlanView/PlanView.qml" line="958"/>
+        <source>Create complex pattern:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/PlanView/PlanView.qml" line="921"/>
-        <source>Create complex pattern:</source>
+        <location filename="../src/PlanView/PlanView.qml" line="983"/>
+        <source>Mission overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/PlanView/PlanView.qml" line="947"/>
-        <source>Load KML/SHP...</source>
+        <location filename="../src/PlanView/PlanView.qml" line="983"/>
+        <source>GeoFence overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/PlanView/PlanView.qml" line="965"/>
-        <source>Mission overwrite</source>
+        <location filename="../src/PlanView/PlanView.qml" line="983"/>
+        <source>Rally Points overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/PlanView/PlanView.qml" line="965"/>
-        <source>GeoFence overwrite</source>
+        <location filename="../src/PlanView/PlanView.qml" line="991"/>
+        <source>You have unsaved changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/PlanView/PlanView.qml" line="965"/>
-        <source>Rally Points overwrite</source>
+        <location filename="../src/PlanView/PlanView.qml" line="1090"/>
+        <source>Open...</source>
         <translation type="unfinished"></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>
+        <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"></translation>
     </message>
     <message>
-        <location filename="../src/PlanView/PlanView.qml" line="973"/>
-        <source>You have unsaved changes.</source>
+        <location filename="../src/PlanView/PlanView.qml" line="190"/>
+        <location filename="../src/PlanView/PlanView.qml" line="195"/>
+        <source>Unable to %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/PlanView/PlanView.qml" line="975"/>
-        <source>Plan File:</source>
+        <location filename="../src/PlanView/PlanView.qml" line="190"/>
+        <source>Plan has incomplete items. Complete all items and %1 again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/PlanView/PlanView.qml" line="986"/>
-        <source>New...</source>
+        <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"></translation>
     </message>
     <message>
-        <location filename="../src/PlanView/PlanView.qml" line="991"/>
-        <source>New Plan</source>
+        <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"></translation>
     </message>
     <message>
-        <location filename="../src/PlanView/PlanView.qml" line="996"/>
-        <source>Open...</source>
+        <location filename="../src/PlanView/PlanView.qml" line="998"/>
+        <location filename="../src/PlanView/PlanView.qml" line="1050"/>
+        <source>Create Plan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/PlanView/PlanView.qml" line="1010"/>
-        <source>Save</source>
+        <location filename="../src/PlanView/PlanView.qml" line="1069"/>
+        <source>Storage</source>
         <translation type="unfinished"></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"></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"></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"></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"></translation>
     </message>
     <message>
-        <location filename="../src/PlanView/PlanView.qml" line="1070"/>
-        <source>Download</source>
+        <location filename="../src/PlanView/PlanView.qml" line="1147"/>
+        <source>Vehicle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/PlanView/PlanView.qml" line="1085"/>
-        <source>Clear Vehicle Mission</source>
+        <location filename="../src/PlanView/PlanView.qml" line="1167"/>
+        <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -11401,7 +12490,7 @@ Is this really what you want?</source>
 <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"></translation>
     </message>
@@ -11409,7 +12498,7 @@ Is this really what you want?</source>
 <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"></translation>
     </message>
@@ -11417,21 +12506,32 @@ Is this really what you want?</source>
 <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"></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"></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"></translation>
     </message>
 </context>
+<context>
+    <name>PreFlightCheckListShowAction</name>
+    <message>
+        <location filename="../src/FlightDisplay/PreFlightCheckListShowAction.qml" line="14"/>
+        <source>Checklist</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>PreFlightGPSCheck</name>
     <message>
@@ -11537,137 +12637,164 @@ Is this really what you want?</source>
 <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>
+        <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"></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"></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"></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"></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"></translation>
     </message>
     <message>
-        <location filename="../src/QGCApplication.cc" line="647"/>
-        <source>Telemetry save error</source>
+        <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"></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"></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"></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>
+        <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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></translation>
     </message>
     <message>
-        <location filename="../src/api/QGCCorePlugin.cc" line="193"/>
+        <location filename="../src/api/QGCCorePlugin.cc" line="287"/>
         <source>Video Stream</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/api/QGCCorePlugin.cc" line="195"/>
+        <location filename="../src/api/QGCCorePlugin.cc" line="290"/>
         <source>Health</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/api/QGCCorePlugin.cc" line="196"/>
+        <location filename="../src/api/QGCCorePlugin.cc" line="291"/>
         <source>Vibration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/api/QGCCorePlugin.cc" line="291"/>
+        <location filename="../src/api/QGCCorePlugin.cc" line="307"/>
+        <source>Log Download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/api/QGCCorePlugin.cc" line="309"/>
+        <source>GeoTag Images</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/api/QGCCorePlugin.cc" line="311"/>
+        <source>MAVLink Console</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/api/QGCCorePlugin.cc" line="313"/>
+        <source>MAVLink Inspector</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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"></translation>
     </message>
@@ -11691,33 +12818,38 @@ sudo apt-get remove modemmanager</source>
 <context>
     <name>QGCFileDialog</name>
     <message>
-        <location filename="../src/QmlControls/QGCFileDialog.qml" line="137"/>
-        <location filename="../src/QmlControls/QGCFileDialog.qml" line="250"/>
+        <location filename="../src/QmlControls/QGCFileDialog.qml" line="119"/>
+        <source>Path: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/QmlControls/QGCFileDialog.qml" line="150"/>
+        <location filename="../src/QmlControls/QGCFileDialog.qml" line="263"/>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/QmlControls/QGCFileDialog.qml" line="148"/>
+        <location filename="../src/QmlControls/QGCFileDialog.qml" line="161"/>
         <source>No files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/QmlControls/QGCFileDialog.qml" line="189"/>
+        <location filename="../src/QmlControls/QGCFileDialog.qml" line="202"/>
         <source>New file name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/QmlControls/QGCFileDialog.qml" line="202"/>
+        <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"></translation>
     </message>
     <message>
-        <location filename="../src/QmlControls/QGCFileDialog.qml" line="210"/>
+        <location filename="../src/QmlControls/QGCFileDialog.qml" line="223"/>
         <source>The file %1 exists. Click Save again to replace it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/QmlControls/QGCFileDialog.qml" line="218"/>
+        <location filename="../src/QmlControls/QGCFileDialog.qml" line="231"/>
         <source>Save to existing file:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11746,1600 +12878,1410 @@ sudo apt-get remove modemmanager</source>
     </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"></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"></translation>
-    </message>
+    <name>QGCLogEntry</name>
     <message>
-        <location filename="../src/comm/QGCFlightGearLink.cc" line="153"/>
-        <source>FlightGear Crashed</source>
+        <location filename="../src/AnalyzeView/LogDownloadController.cc" line="95"/>
+        <source>Pending</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>QGCMAVLinkVehicle</name>
     <message>
-        <location filename="../src/comm/QGCFlightGearLink.cc" line="153"/>
-        <source>This is a FlightGear-related problem. Please upgrade FlightGear</source>
+        <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="578"/>
+        <source>All</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>QGCMapPolygonVisuals</name>
     <message>
-        <location filename="../src/comm/QGCFlightGearLink.cc" line="156"/>
-        <source>FlightGear Start Timed Out</source>
+        <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="220"/>
+        <source>Select Polygon File</source>
         <translation type="unfinished"></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>
+        <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="248"/>
+        <source>Remove vertex</source>
         <translation type="unfinished"></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>
+        <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="50"/>
+        <source>Polygon Tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/comm/QGCFlightGearLink.cc" line="166"/>
-        <source>FlightGear Error</source>
+        <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"></translation>
     </message>
     <message>
-        <location filename="../src/comm/QGCFlightGearLink.cc" line="166"/>
-        <source>Please check if the path and command is correct.</source>
+        <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="261"/>
+        <source>Set radius...</source>
         <translation type="unfinished"></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>
+        <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="267"/>
+        <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="273"/>
+        <source>Edit position...</source>
         <translation type="unfinished"></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>
+        <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="269"/>
+        <source>Edit Center Position</source>
         <translation type="unfinished"></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>
+        <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="275"/>
+        <source>Edit Vertex Position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/comm/QGCFlightGearLink.cc" line="779"/>
-        <source>--fg-root directory specified from ui option not found: %1</source>
+        <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="528"/>
+        <source>Basic</source>
         <translation type="unfinished"></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>
+        <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="535"/>
+        <source>Circular</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/comm/QGCFlightGearLink.cc" line="807"/>
-        <source>--fg-scenery directory specified from ui option not found: %1</source>
+        <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="542"/>
+        <source>Done Tracing</source>
         <translation type="unfinished"></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>
+        <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="542"/>
+        <source>Trace</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/comm/QGCFlightGearLink.cc" line="821"/>
-        <source>Incorrect %1 installation. Aircraft directory is missing: &apos;%2&apos;.</source>
+        <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="560"/>
+        <source>Load KML/SHP...</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>QGCMapPolylineVisuals</name>
     <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>
+        <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="40"/>
+        <source>Polyline Tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/comm/QGCFlightGearLink.cc" line="842"/>
-        <source>Incorrect installation. Protocol directory is missing (%1).</source>
+        <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"></translation>
     </message>
     <message>
-        <location filename="../src/comm/QGCFlightGearLink.cc" line="850"/>
-        <source>Incorrect installation. FlightGear protocol file missing: %1</source>
+        <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="128"/>
+        <source>Select KML File</source>
         <translation type="unfinished"></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>
+        <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="151"/>
+        <source>Remove vertex</source>
         <translation type="unfinished"></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>
+        <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="156"/>
+        <source>Edit position...</source>
         <translation type="unfinished"></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>
+        <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="157"/>
+        <source>Edit Position</source>
         <translation type="unfinished"></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>
+        <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="336"/>
+        <source>Basic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/comm/QGCFlightGearLink.cc" line="894"/>
-        <source>Fix it for me</source>
+        <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="343"/>
+        <source>Done Tracing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/comm/QGCFlightGearLink.cc" line="910"/>
-        <source>Copy failed</source>
+        <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="343"/>
+        <source>Trace</source>
         <translation type="unfinished"></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>
+        <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="360"/>
+        <source>Load KML...</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>QGCMapRCToParamDialog</name>
     <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>
+        <location filename="../src/ui/QGCMapRCToParamDialog.ui" line="14"/>
+        <source>Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/comm/QGCFlightGearLink.cc" line="919"/>
-        <source>Copy to Clipboard</source>
+        <location filename="../src/ui/QGCMapRCToParamDialog.ui" line="25"/>
+        <source>Bind</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QGCHilConfiguration</name>
     <message>
-        <location filename="../src/ui/QGCHilConfiguration.ui" line="20"/>
-        <source>HIL Config</source>
+        <location filename="../src/ui/QGCMapRCToParamDialog.ui" line="32"/>
+        <source>Parameter Tuning ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/QGCHilConfiguration.ui" line="26"/>
-        <source>Simulator</source>
+        <location filename="../src/ui/QGCMapRCToParamDialog.ui" line="42"/>
+        <location filename="../src/ui/QGCMapRCToParamDialog.ui" line="46"/>
+        <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/QGCHilConfiguration.ui" line="42"/>
-        <source>FlightGear 3.0+</source>
+        <location filename="../src/ui/QGCMapRCToParamDialog.ui" line="51"/>
+        <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/QGCHilConfiguration.ui" line="47"/>
-        <source>X-Plane 10</source>
+        <location filename="../src/ui/QGCMapRCToParamDialog.ui" line="56"/>
+        <source>3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/QGCHilConfiguration.ui" line="52"/>
-        <source>X-Plane 9</source>
+        <location filename="../src/ui/QGCMapRCToParamDialog.ui" line="64"/>
+        <source>Parameter</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QGCHilFlightGearConfiguration</name>
     <message>
-        <location filename="../src/ui/QGCHilFlightGearConfiguration.ui" line="20"/>
-        <source>Form</source>
+        <location filename="../src/ui/QGCMapRCToParamDialog.ui" line="71"/>
+        <source>TextLabel</source>
         <translation type="unfinished"></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>
+        <location filename="../src/ui/QGCMapRCToParamDialog.ui" line="78"/>
+        <source>with</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/QGCHilFlightGearConfiguration.ui" line="58"/>
-        <source>Airframe:</source>
+        <location filename="../src/ui/QGCMapRCToParamDialog.ui" line="85"/>
+        <source>Scale (keep default)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/QGCHilFlightGearConfiguration.ui" line="84"/>
-        <source>Start</source>
+        <location filename="../src/ui/QGCMapRCToParamDialog.ui" line="99"/>
+        <source>Center value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/QGCHilFlightGearConfiguration.ui" line="91"/>
-        <source>Stop</source>
+        <location filename="../src/ui/QGCMapRCToParamDialog.ui" line="122"/>
+        <source>Minimum Value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/QGCHilFlightGearConfiguration.ui" line="98"/>
-        <source>Sensor HIL</source>
+        <location filename="../src/ui/QGCMapRCToParamDialog.ui" line="142"/>
+        <source>Maximum Value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/QGCHilFlightGearConfiguration.ui" line="108"/>
-        <source>Barometer Offset [kPa]:</source>
+        <location filename="../src/ui/QGCMapRCToParamDialog.ui" line="168"/>
+        <source>Waiting for parameter refresh,,,</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/QGCHilFlightGearConfiguration.ui" line="115"/>
-        <source>0</source>
+        <location filename="../src/ui/QGCMapRCToParamDialog.ui" line="188"/>
+        <source>Tuning IDs can be mapped to channels in the RC settings</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>QGCOptionsComboBox</name>
     <message>
-        <location filename="../src/ui/QGCHilFlightGearConfiguration.cc" line="24"/>
-        <source>Reset to default options</source>
+        <location filename="../src/QmlControls/QGCOptionsComboBox.qml" line="24"/>
+        <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QGCHilJSBSimConfiguration</name>
+    <name>QGCPluginHost</name>
     <message>
-        <location filename="../src/ui/QGCHilJSBSimConfiguration.ui" line="20"/>
+        <location filename="../src/ui/QGCPluginHost.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/QGCHilJSBSimConfiguration.ui" line="38"/>
-        <source>Airframe:</source>
-        <translation type="unfinished"></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>
+        <location filename="../src/ui/QGCPluginHost.ui" line="49"/>
+        <source>Loaded Plugins</source>
         <translation type="unfinished"></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>
+        <location filename="../src/ui/QGCPluginHost.ui" line="62"/>
+        <source>Plugin Log</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>QGCPopupDialogContainer</name>
     <message>
-        <location filename="../src/ui/QGCHilJSBSimConfiguration.ui" line="84"/>
-        <source>Start</source>
+        <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="97"/>
+        <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/QGCHilJSBSimConfiguration.ui" line="91"/>
-        <source>Stop</source>
+        <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="100"/>
+        <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="109"/>
+        <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QGCHilXPlaneConfiguration</name>
     <message>
-        <location filename="../src/ui/QGCHilXPlaneConfiguration.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="103"/>
+        <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/QGCHilXPlaneConfiguration.ui" line="32"/>
-        <source>Start</source>
+        <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="106"/>
+        <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/QGCHilXPlaneConfiguration.ui" line="39"/>
-        <source>Host</source>
+        <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="112"/>
+        <source>Save All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/QGCHilXPlaneConfiguration.ui" line="59"/>
-        <source>Enable sensor level HIL</source>
+        <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="115"/>
+        <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/QGCHilXPlaneConfiguration.ui" line="70"/>
-        <source>127.0.0.1:49000</source>
+        <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="118"/>
+        <source>Yes to All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/QGCHilXPlaneConfiguration.ui" line="84"/>
-        <source>Use newer actuator format</source>
+        <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="121"/>
+        <source>Retry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/QGCHilXPlaneConfiguration.cc" line="24"/>
-        <location filename="../src/ui/QGCHilXPlaneConfiguration.cc" line="75"/>
-        <source>Connect</source>
+        <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="124"/>
+        <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/QGCHilXPlaneConfiguration.cc" line="70"/>
-        <source>Disconnect</source>
+        <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="127"/>
+        <source>Restore to Defaults</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QGCJSBSimLink</name>
     <message>
-        <location filename="../src/comm/QGCJSBSimLink.cc" line="45"/>
-        <source>JSBSim Link (port:%1)</source>
+        <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="130"/>
+        <source>Ignore</source>
         <translation type="unfinished"></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>
+        <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="136"/>
+        <source>Cancel</source>
         <translation type="unfinished"></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>
+        <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="139"/>
+        <source>Close</source>
         <translation type="unfinished"></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>
+        <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="142"/>
+        <source>No</source>
         <translation type="unfinished"></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>
+        <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="145"/>
+        <source>No to All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/comm/QGCJSBSimLink.cc" line="176"/>
-        <source>JSBSim error occurred. Please check if the path and command is correct.</source>
+        <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="148"/>
+        <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QGCLogEntry</name>
+    <name>QGCTextField</name>
     <message>
-        <location filename="../src/AnalyzeView/LogDownloadController.cc" line="95"/>
-        <source>Pending</source>
+        <location filename="../src/QmlControls/QGCTextField.qml" line="119"/>
+        <source>?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QGCMAVLinkLogPlayer</name>
+    <name>QGCViewDialogContainer</name>
     <message>
-        <location filename="../src/ui/QGCMAVLinkLogPlayer.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="30"/>
+        <source>Ok</source>
         <translation type="unfinished"></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>
+        <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="33"/>
+        <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="42"/>
+        <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/QGCMAVLinkLogPlayer.ui" line="48"/>
-        <source>...</source>
+        <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="36"/>
+        <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/QGCMAVLinkLogPlayer.ui" line="65"/>
-        <source>Time</source>
+        <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="39"/>
+        <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/QGCMAVLinkLogPlayer.ui" line="88"/>
-        <source>No Flight Data selected..</source>
+        <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="45"/>
+        <source>Save All</source>
         <translation type="unfinished"></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>
+        <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="48"/>
+        <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/QGCMAVLinkLogPlayer.ui" line="111"/>
-        <source>Replay Flight Data</source>
+        <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="51"/>
+        <source>Yes to All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/QGCMAVLinkLogPlayer.cc" line="71"/>
-        <source>Log Replay</source>
+        <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="54"/>
+        <source>Retry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/QGCMAVLinkLogPlayer.cc" line="71"/>
-        <source>You must close all connections prior to replaying a log.</source>
+        <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="57"/>
+        <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/QGCMAVLinkLogPlayer.cc" line="77"/>
-        <source>Load Telemetry Log File</source>
+        <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="60"/>
+        <source>Restore to Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/QGCMAVLinkLogPlayer.cc" line="79"/>
-        <source>MAVLink Log Files (*.tlog);;All Files (*)</source>
+        <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="63"/>
+        <source>Ignore</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QGCMapPolygonVisuals</name>
     <message>
-        <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="176"/>
-        <source>Select Polygon File</source>
+        <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="69"/>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="207"/>
-        <source>Remove vertex</source>
+        <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="72"/>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="220"/>
-        <source>Circle</source>
+        <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="75"/>
+        <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="225"/>
-        <source>Polygon</source>
+        <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="78"/>
+        <source>No to All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="230"/>
-        <source>Set radius...</source>
+        <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="81"/>
+        <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>QGroundControlQmlGlobal</name>
     <message>
-        <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="236"/>
-        <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="242"/>
-        <source>Edit position...</source>
+        <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="258"/>
+        <source>32 bit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="238"/>
-        <source>Edit Center Position</source>
+        <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="260"/>
+        <source>64 bit</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>QMap3D</name>
     <message>
-        <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="244"/>
-        <source>Edit Vertex Position</source>
+        <location filename="../src/ui/QMap3D.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="248"/>
-        <source>Load KML/SHP...</source>
+        <location filename="../src/ui/QMap3D.ui" line="20"/>
+        <source>Map</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="509"/>
-        <source>Radius:</source>
+        <location filename="../src/ui/QMap3D.ui" line="30"/>
+        <source>Vehicle</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QGCMapPolylineVisuals</name>
-    <message>
-        <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="118"/>
-        <source>Select KML File</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>QObject</name>
     <message>
-        <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="141"/>
-        <source>Remove vertex</source>
+        <location filename="../src/Airmap/QJsonWebToken/src/qjsonwebtoken.cpp" line="189"/>
+        <source>{&quot;typ&quot;: &quot;JWT&quot;, &quot;alg&quot; : &quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="150"/>
-        <source>Edit position...</source>
+        <location filename="../src/Airmap/QJsonWebToken/src/qjsonwebtoken.cpp" line="191"/>
+        <source>&quot;}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="151"/>
-        <source>Edit Position</source>
+        <location filename="../src/comm/QGCSerialPortInfo.cc" line="274"/>
+        <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="155"/>
-        <source>Load KML...</source>
+        <location filename="../src/comm/QGCSerialPortInfo.cc" line="278"/>
+        <source>Pixhawk</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QGCMapRCToParamDialog</name>
     <message>
-        <location filename="../src/ui/QGCMapRCToParamDialog.ui" line="14"/>
-        <source>Dialog</source>
+        <location filename="../src/comm/QGCSerialPortInfo.cc" line="280"/>
+        <source>SiK Radio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/QGCMapRCToParamDialog.ui" line="25"/>
-        <source>Bind</source>
+        <location filename="../src/comm/QGCSerialPortInfo.cc" line="282"/>
+        <source>PX4 Flow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/QGCMapRCToParamDialog.ui" line="32"/>
-        <source>Parameter Tuning ID</source>
+        <location filename="../src/comm/QGCSerialPortInfo.cc" line="284"/>
+        <source>OpenPilot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/QGCMapRCToParamDialog.ui" line="42"/>
-        <location filename="../src/ui/QGCMapRCToParamDialog.ui" line="46"/>
-        <source>1</source>
+        <location filename="../src/comm/QGCSerialPortInfo.cc" line="286"/>
+        <source>RTK GPS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/QGCMapRCToParamDialog.ui" line="51"/>
-        <source>2</source>
+        <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="26"/>
+        <location filename="../src/Vehicle/Vehicle.cc" line="59"/>
+        <source>Guided mode not supported by Vehicle.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/QGCMapRCToParamDialog.ui" line="56"/>
-        <source>3</source>
+        <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="30"/>
+        <source>Follow Me</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/QGCMapRCToParamDialog.ui" line="64"/>
-        <source>Parameter</source>
+        <location filename="../src/JsonHelper.cc" line="48"/>
+        <source>The following required keys are missing: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/QGCMapRCToParamDialog.ui" line="71"/>
-        <source>TextLabel</source>
+        <location filename="../src/JsonHelper.cc" line="62"/>
+        <source>value for coordinate is not array</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/QGCMapRCToParamDialog.ui" line="78"/>
-        <source>with</source>
+        <location filename="../src/JsonHelper.cc" line="69"/>
+        <source>Coordinate array must contain %1 values</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/QGCMapRCToParamDialog.ui" line="85"/>
-        <source>Scale (keep default)</source>
+        <location filename="../src/JsonHelper.cc" line="75"/>
+        <source>Coordinate array may only contain double values, found: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/QGCMapRCToParamDialog.ui" line="99"/>
-        <source>Center value</source>
+        <location filename="../src/JsonHelper.cc" line="153"/>
+        <source>Incorrect value type - key:type:expected %1:%2:%3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/QGCMapRCToParamDialog.ui" line="122"/>
-        <source>Minimum Value</source>
+        <location filename="../src/JsonHelper.cc" line="193"/>
+        <source>enum strings/values count mismatch in %3 strings:values %1:%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/QGCMapRCToParamDialog.ui" line="142"/>
-        <source>Maximum Value</source>
+        <location filename="../src/JsonHelper.cc" line="244"/>
+        <source>Incorrect file type key expected:%1 actual:%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/QGCMapRCToParamDialog.ui" line="168"/>
-        <source>Waiting for parameter refresh,,,</source>
+        <location filename="../src/JsonHelper.cc" line="251"/>
+        <source>File version %1 is no longer supported</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/QGCMapRCToParamDialog.ui" line="188"/>
-        <source>Tuning IDs can be mapped to channels in the RC settings</source>
+        <location filename="../src/JsonHelper.cc" line="255"/>
+        <source>File version %1 is newer than current supported version %2</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QGCPluginHost</name>
     <message>
-        <location filename="../src/ui/QGCPluginHost.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../src/JsonHelper.cc" line="414"/>
+        <source>value for coordinate array is not array</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/QGCPluginHost.ui" line="49"/>
-        <source>Loaded Plugins</source>
+        <location filename="../src/JsonHelper.cc" line="523"/>
+        <source>Unknown type: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/QGCPluginHost.ui" line="62"/>
-        <source>Plugin Log</source>
+        <location filename="../src/main.cc" line="233"/>
+        <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QGCTextField</name>
     <message>
-        <location filename="../src/QmlControls/QGCTextField.qml" line="119"/>
-        <source>?</source>
+        <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"></translation>
     </message>
 </context>
 <context>
-    <name>QGCUASFileView</name>
+    <name>QmlTest</name>
     <message>
-        <location filename="../src/ui/QGCUASFileView.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../src/QmlControls/QmlTest.qml" line="228"/>
+        <source>Window Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/QGCUASFileView.ui" line="20"/>
-        <source>List Files</source>
+        <location filename="../src/QmlControls/QmlTest.qml" line="232"/>
+        <source>Import/Export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/QGCUASFileView.ui" line="55"/>
-        <source>Download File</source>
+        <location filename="../src/QmlControls/QmlTest.qml" line="240"/>
+        <source>Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/QGCUASFileView.ui" line="78"/>
-        <location filename="../src/ui/QGCUASFileView.cc" line="114"/>
-        <source>Upload File</source>
+        <location filename="../src/QmlControls/QmlTest.qml" line="247"/>
+        <source>Dark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/QGCUASFileView.cc" line="58"/>
-        <source>Download Directory</source>
+        <location filename="../src/QmlControls/QmlTest.qml" line="288"/>
+        <location filename="../src/QmlControls/QmlTest.qml" line="393"/>
+        <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/QGCUASFileView.cc" line="84"/>
-        <source>Downloading: %1</source>
+        <location filename="../src/QmlControls/QmlTest.qml" line="294"/>
+        <location filename="../src/QmlControls/QmlTest.qml" line="306"/>
+        <source>Value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/QGCUASFileView.cc" line="116"/>
-        <source>Uploading: %1</source>
+        <location filename="../src/QmlControls/QmlTest.qml" line="300"/>
+        <location filename="../src/QmlControls/QmlTest.qml" line="400"/>
+        <source>Disabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/QGCUASFileView.cc" line="139"/>
-        <source>Error: %1</source>
+        <location filename="../src/QmlControls/QmlTest.qml" line="386"/>
+        <source>QGC name</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QGCUASFileViewMulti</name>
     <message>
-        <location filename="../src/ui/QGCUASFileViewMulti.ui" line="14"/>
-        <source>Onboard Files</source>
+        <location filename="../src/QmlControls/QmlTest.qml" line="415"/>
+        <location filename="../src/QmlControls/QmlTest.qml" line="425"/>
+        <source>Label</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QGCViewDialogContainer</name>
     <message>
-        <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="30"/>
-        <source>Ok</source>
+        <location filename="../src/QmlControls/QmlTest.qml" line="438"/>
+        <location filename="../src/QmlControls/QmlTest.qml" line="443"/>
+        <location filename="../src/QmlControls/QmlTest.qml" line="456"/>
+        <location filename="../src/QmlControls/QmlTest.qml" line="461"/>
+        <location filename="../src/QmlControls/QmlTest.qml" line="507"/>
+        <location filename="../src/QmlControls/QmlTest.qml" line="513"/>
+        <source>Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="33"/>
-        <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="42"/>
-        <source>Open</source>
+        <location filename="../src/QmlControls/QmlTest.qml" line="474"/>
+        <location filename="../src/QmlControls/QmlTest.qml" line="481"/>
+        <source>Hover Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="36"/>
-        <source>Save</source>
+        <location filename="../src/QmlControls/QmlTest.qml" line="495"/>
+        <location filename="../src/QmlControls/QmlTest.qml" line="597"/>
+        <location filename="../src/QmlControls/QmlTest.qml" line="602"/>
+        <source>Item 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="39"/>
-        <source>Apply</source>
+        <location filename="../src/QmlControls/QmlTest.qml" line="498"/>
+        <location filename="../src/QmlControls/QmlTest.qml" line="597"/>
+        <location filename="../src/QmlControls/QmlTest.qml" line="602"/>
+        <source>Item 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="45"/>
-        <source>Save All</source>
+        <location filename="../src/QmlControls/QmlTest.qml" line="501"/>
+        <location filename="../src/QmlControls/QmlTest.qml" line="597"/>
+        <location filename="../src/QmlControls/QmlTest.qml" line="602"/>
+        <source>Item 3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="48"/>
-        <source>Yes</source>
+        <location filename="../src/QmlControls/QmlTest.qml" line="530"/>
+        <location filename="../src/QmlControls/QmlTest.qml" line="540"/>
+        <source>Radio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="51"/>
-        <source>Yes to All</source>
+        <location filename="../src/QmlControls/QmlTest.qml" line="557"/>
+        <location filename="../src/QmlControls/QmlTest.qml" line="567"/>
+        <source>Check Box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="54"/>
-        <source>Retry</source>
+        <location filename="../src/QmlControls/QmlTest.qml" line="614"/>
+        <location filename="../src/QmlControls/QmlTest.qml" line="619"/>
+        <source>SUB MENU</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>RCRSSIIndicator</name>
     <message>
-        <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="57"/>
-        <source>Reset</source>
+        <location filename="../src/ui/toolbar/RCRSSIIndicator.qml" line="51"/>
+        <source>RC RSSI Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="60"/>
-        <source>Restore to Defaults</source>
+        <location filename="../src/ui/toolbar/RCRSSIIndicator.qml" line="51"/>
+        <source>RC RSSI Data Unavailable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="63"/>
-        <source>Ignore</source>
+        <location filename="../src/ui/toolbar/RCRSSIIndicator.qml" line="51"/>
+        <source>N/A</source>
+        <comment>No data available</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="69"/>
-        <source>Cancel</source>
+        <location filename="../src/ui/toolbar/RCRSSIIndicator.qml" line="64"/>
+        <source>RSSI:</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>RCToParamDialog</name>
     <message>
-        <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="72"/>
-        <source>Close</source>
+        <location filename="../src/QmlControls/RCToParamDialog.qml" line="25"/>
+        <source>RC To Param</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="75"/>
-        <source>No</source>
+        <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"></translation>
     </message>
     <message>
-        <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="78"/>
-        <source>No to All</source>
+        <location filename="../src/QmlControls/RCToParamDialog.qml" line="50"/>
+        <source>Waiting on parameter update from Vehicle.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="81"/>
-        <source>Abort</source>
+        <location filename="../src/QmlControls/RCToParamDialog.qml" line="61"/>
+        <source>Parameter</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QGCXPlaneLink</name>
     <message>
-        <location filename="../src/comm/QGCXPlaneLink.cc" line="64"/>
-        <source>X-Plane Link (localPort:%1)</source>
+        <location filename="../src/QmlControls/RCToParamDialog.qml" line="64"/>
+        <source>Tuning ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/comm/QGCXPlaneLink.cc" line="187"/>
-        <source>Waiting for XPlane..</source>
+        <location filename="../src/QmlControls/RCToParamDialog.qml" line="72"/>
+        <source>Scale</source>
         <translation type="unfinished"></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>
+        <location filename="../src/QmlControls/RCToParamDialog.qml" line="78"/>
+        <source>Center Value</source>
         <translation type="unfinished"></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>
+        <location filename="../src/QmlControls/RCToParamDialog.qml" line="84"/>
+        <source>Min Value</source>
         <translation type="unfinished"></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>
+        <location filename="../src/QmlControls/RCToParamDialog.qml" line="90"/>
+        <source>Max Value</source>
         <translation type="unfinished"></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>
+        <location filename="../src/QmlControls/RCToParamDialog.qml" line="101"/>
+        <source>Double check that all values are correct prior to confirming dialog.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>ROIIndicator</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>
+        <location filename="../src/ui/toolbar/ROIIndicator.qml" line="51"/>
+        <source>ROI Disabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/comm/QGCXPlaneLink.cc" line="855"/>
-        <source>Receiving from XPlane at %1 Hz</source>
+        <location filename="../src/ui/toolbar/ROIIndicator.qml" line="60"/>
+        <source>Disable ROI</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>RadioComponent</name>
     <message>
-        <location filename="../src/comm/QGCXPlaneLink.cc" line="924"/>
-        <source>Receiving from XPlane.</source>
+        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="34"/>
+        <source>Radio</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QMap3D</name>
     <message>
-        <location filename="../src/ui/QMap3D.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="54"/>
+        <source>Reboot required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/QMap3D.ui" line="20"/>
-        <source>Map</source>
+        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="54"/>
+        <source>Your stick mappings have changed, you must reboot the vehicle for correct operation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/QMap3D.ui" line="30"/>
-        <source>Vehicle</source>
+        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="55"/>
+        <source>Throttle channel reversed</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
-        <location filename="../src/Airmap/QJsonWebToken/src/qjsonwebtoken.cpp" line="189"/>
-        <source>{&quot;typ&quot;: &quot;JWT&quot;, &quot;alg&quot; : &quot;</source>
+        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="55"/>
+        <source>Calibration failed. The throttle channel on your transmitter is reversed. You must correct this on your transmitter in order to complete calibration.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Airmap/QJsonWebToken/src/qjsonwebtoken.cpp" line="191"/>
-        <source>&quot;}</source>
+        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="61"/>
+        <source>Center your sticks and move throttle all the way down, then press Ok to copy trims. After pressing Ok, reset the trims on your radio back to zero.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/comm/QGCSerialPortInfo.cc" line="274"/>
-        <source>Unknown</source>
+        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="72"/>
+        <source>Before calibrating you should zero all your trims and subtrims. Click Ok to start Calibration.
+
+%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/comm/QGCSerialPortInfo.cc" line="278"/>
-        <source>Pixhawk</source>
+        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="73"/>
+        <source>Please ensure all motor power is disconnected AND all props are removed from the vehicle.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/comm/QGCSerialPortInfo.cc" line="280"/>
-        <source>SiK Radio</source>
+        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="84"/>
+        <source>Please turn on transmitter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/comm/QGCSerialPortInfo.cc" line="282"/>
-        <source>PX4 Flow</source>
+        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="84"/>
+        <source>%1 channels or more are needed to fly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/comm/QGCSerialPortInfo.cc" line="284"/>
-        <source>OpenPilot</source>
+        <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"></translation>
     </message>
     <message>
-        <location filename="../src/comm/QGCSerialPortInfo.cc" line="286"/>
-        <source>RTK GPS</source>
+        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="114"/>
+        <source>DSM2 Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="26"/>
-        <location filename="../src/Vehicle/Vehicle.cc" line="55"/>
-        <source>Guided mode not supported by Vehicle.</source>
+        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="120"/>
+        <source>DSMX (7 channels or less)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="30"/>
-        <source>Follow Me</source>
+        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="127"/>
+        <source>DSMX (8 channels or more)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/JsonHelper.cc" line="41"/>
-        <source>The following required keys are missing: %1</source>
+        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="183"/>
+        <source>Not Mapped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/JsonHelper.cc" line="55"/>
-        <source>value for coordinate is not array</source>
+        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="209"/>
+        <source>Attitude Controls</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/JsonHelper.cc" line="62"/>
-        <source>Coordinate array must contain %1 values</source>
+        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="217"/>
+        <source>Roll</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/JsonHelper.cc" line="68"/>
-        <source>Coordinate array may only contain double values, found: %1</source>
+        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="247"/>
+        <source>Pitch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/JsonHelper.cc" line="146"/>
-        <source>Incorrect value type - key:type:expected %1:%2:%3</source>
+        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="277"/>
+        <source>Yaw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/JsonHelper.cc" line="186"/>
-        <source>enum strings/values count mismatch in %3 strings:values %1:%2</source>
+        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="307"/>
+        <source>Throttle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/JsonHelper.cc" line="240"/>
-        <source>Incorrect file type key expected:%1 actual:%2</source>
+        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="336"/>
+        <source>Skip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/JsonHelper.cc" line="251"/>
-        <source>Incorrect type for version value, must be integer</source>
+        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="342"/>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/JsonHelper.cc" line="257"/>
-        <source>File version %1 is no longer supported</source>
+        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="349"/>
+        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="352"/>
+        <source>Calibrate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/JsonHelper.cc" line="261"/>
-        <source>File version %1 is newer than current supported version %2</source>
+        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="375"/>
+        <source>Additional Radio setup:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/JsonHelper.cc" line="283"/>
-        <source>value for coordinate array is not array</source>
+        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="412"/>
+        <source>Spektrum Bind</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/JsonHelper.cc" line="392"/>
-        <source>Unknown type: %1</source>
+        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="417"/>
+        <source>Copy Trims</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="441"/>
+        <source>Mode 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="447"/>
+        <source>Mode 2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QmlTest</name>
+    <name>RadioComponentController</name>
     <message>
-        <location filename="../src/QmlControls/QmlTest.qml" line="228"/>
-        <source>Window Color</source>
+        <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.
+
+Click Next to continue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/QmlControls/QmlTest.qml" line="232"/>
-        <source>Import/Export</source>
+        <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.
+
+Please ensure all motor power is disconnected AND all props are removed from the vehicle.
+
+Click Next to continue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/QmlControls/QmlTest.qml" line="240"/>
-        <source>Light</source>
+        <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"></translation>
     </message>
     <message>
-        <location filename="../src/QmlControls/QmlTest.qml" line="247"/>
-        <source>Dark</source>
+        <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"></translation>
     </message>
     <message>
-        <location filename="../src/QmlControls/QmlTest.qml" line="288"/>
-        <location filename="../src/QmlControls/QmlTest.qml" line="393"/>
-        <source>Enabled</source>
+        <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"></translation>
     </message>
     <message>
-        <location filename="../src/QmlControls/QmlTest.qml" line="294"/>
-        <location filename="../src/QmlControls/QmlTest.qml" line="306"/>
-        <source>Value</source>
+        <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"></translation>
     </message>
     <message>
-        <location filename="../src/QmlControls/QmlTest.qml" line="300"/>
-        <location filename="../src/QmlControls/QmlTest.qml" line="400"/>
-        <source>Disabled</source>
+        <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"></translation>
     </message>
     <message>
-        <location filename="../src/QmlControls/QmlTest.qml" line="386"/>
-        <source>QGC name</source>
+        <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"></translation>
     </message>
     <message>
-        <location filename="../src/QmlControls/QmlTest.qml" line="415"/>
-        <location filename="../src/QmlControls/QmlTest.qml" line="425"/>
-        <source>Label</source>
+        <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"></translation>
     </message>
     <message>
-        <location filename="../src/QmlControls/QmlTest.qml" line="438"/>
-        <location filename="../src/QmlControls/QmlTest.qml" line="443"/>
-        <location filename="../src/QmlControls/QmlTest.qml" line="456"/>
-        <location filename="../src/QmlControls/QmlTest.qml" line="461"/>
-        <location filename="../src/QmlControls/QmlTest.qml" line="507"/>
-        <location filename="../src/QmlControls/QmlTest.qml" line="513"/>
-        <source>Button</source>
+        <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"></translation>
     </message>
     <message>
-        <location filename="../src/QmlControls/QmlTest.qml" line="474"/>
-        <location filename="../src/QmlControls/QmlTest.qml" line="481"/>
-        <source>Hover Button</source>
+        <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="136"/>
+        <source>Allow the Pitch stick to move back to center...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/QmlControls/QmlTest.qml" line="495"/>
-        <location filename="../src/QmlControls/QmlTest.qml" line="597"/>
-        <location filename="../src/QmlControls/QmlTest.qml" line="602"/>
-        <source>Item 1</source>
+        <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"></translation>
     </message>
     <message>
-        <location filename="../src/QmlControls/QmlTest.qml" line="498"/>
-        <location filename="../src/QmlControls/QmlTest.qml" line="597"/>
-        <location filename="../src/QmlControls/QmlTest.qml" line="602"/>
-        <source>Item 2</source>
+        <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"></translation>
     </message>
     <message>
-        <location filename="../src/QmlControls/QmlTest.qml" line="501"/>
-        <location filename="../src/QmlControls/QmlTest.qml" line="597"/>
-        <location filename="../src/QmlControls/QmlTest.qml" line="602"/>
-        <source>Item 3</source>
+        <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="205"/>
+        <source>Center the Throttle stick as shown in diagram.
+Reset all transmitter trims to center.
+
+Please ensure all motor power is disconnected from the vehicle.
+
+Click Next to continue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/QmlControls/QmlTest.qml" line="530"/>
-        <location filename="../src/QmlControls/QmlTest.qml" line="540"/>
-        <source>Radio</source>
+        <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="814"/>
+        <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/QmlControls/QmlTest.qml" line="557"/>
-        <location filename="../src/QmlControls/QmlTest.qml" line="567"/>
-        <source>Check Box</source>
+        <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="836"/>
+        <source>Calibrate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/QmlControls/QmlTest.qml" line="614"/>
-        <location filename="../src/QmlControls/QmlTest.qml" line="619"/>
-        <source>SUB MENU</source>
+        <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>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>RCRSSIIndicator</name>
+    <name>RallyPointController</name>
     <message>
-        <location filename="../src/ui/toolbar/RCRSSIIndicator.qml" line="49"/>
-        <source>RC RSSI Status</source>
+        <location filename="../src/MissionManager/RallyPointController.cc" line="102"/>
+        <source>Rally: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/toolbar/RCRSSIIndicator.qml" line="49"/>
-        <source>RC RSSI Data Unavailable</source>
+        <location filename="../src/MissionManager/RallyPointController.cc" line="105"/>
+        <source>Rally Points supports version %1</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>RallyPointEditorHeader</name>
     <message>
-        <location filename="../src/ui/toolbar/RCRSSIIndicator.qml" line="49"/>
-        <source>N/A</source>
-        <comment>No data available</comment>
+        <location filename="../src/PlanView/RallyPointEditorHeader.qml" line="30"/>
+        <source>Rally Points</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/toolbar/RCRSSIIndicator.qml" line="62"/>
-        <source>RSSI:</source>
+        <location filename="../src/PlanView/RallyPointEditorHeader.qml" line="51"/>
+        <source>Rally Points provide alternate landing points when performing a Return to Launch (RTL).</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>RadioComponent</name>
+    <name>RallyPointItemEditor</name>
     <message>
-        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="34"/>
-        <source>Radio</source>
+        <location filename="../src/PlanView/RallyPointItemEditor.qml" line="51"/>
+        <source>Rally Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="54"/>
-        <source>Reboot required</source>
+        <location filename="../src/PlanView/RallyPointItemEditor.qml" line="74"/>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>RallyPointMapVisuals</name>
     <message>
-        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="54"/>
-        <source>Your stick mappings have changed, you must reboot the vehicle for correct operation.</source>
+        <location filename="../src/PlanView/RallyPointMapVisuals.qml" line="72"/>
+        <source>R</source>
+        <comment>rally point map item label</comment>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>RoverChecklist</name>
     <message>
-        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="55"/>
-        <source>Throttle channel reversed</source>
+        <location filename="../src/FlightDisplay/RoverChecklist.qml" line="25"/>
+        <source>Rover Initial Checks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="55"/>
-        <source>Calibration failed. The throttle channel on your transmitter is reversed. You must correct this on your transmitter in order to complete calibration.</source>
+        <location filename="../src/FlightDisplay/RoverChecklist.qml" line="28"/>
+        <source>Hardware</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="61"/>
-        <source>Center your sticks and move throttle all the way down, then press Ok to copy trims. After pressing Ok, reset the trims on your radio back to zero.</source>
+        <location filename="../src/FlightDisplay/RoverChecklist.qml" line="29"/>
+        <source>Battery mounted and secured?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="72"/>
-        <source>Before calibrating you should zero all your trims and subtrims. Click Ok to start Calibration.
-
-%1</source>
+        <location filename="../src/FlightDisplay/RoverChecklist.qml" line="50"/>
+        <source>Please arm the vehicle here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="73"/>
-        <source>Please ensure all motor power is disconnected AND all props are removed from the vehicle.</source>
+        <location filename="../src/FlightDisplay/RoverChecklist.qml" line="53"/>
+        <source>Mission</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="84"/>
-        <source>Please turn on transmitter.</source>
+        <location filename="../src/FlightDisplay/RoverChecklist.qml" line="54"/>
+        <source>Please confirm mission is valid (waypoints valid, no terrain collision).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="84"/>
-        <source>%1 channels or more are needed to fly.</source>
+        <location filename="../src/FlightDisplay/RoverChecklist.qml" line="62"/>
+        <source>Last preparations before launch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="108"/>
-        <source>Click Ok to place your Spektrum receiver in the bind mode. Select the specific receiver type below:</source>
+        <location filename="../src/FlightDisplay/RoverChecklist.qml" line="66"/>
+        <source>Payload</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="112"/>
-        <source>DSM2 Mode</source>
+        <location filename="../src/FlightDisplay/RoverChecklist.qml" line="67"/>
+        <source>Configured and started? Payload lid closed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="117"/>
-        <source>DSMX (7 channels or less)</source>
+        <location filename="../src/FlightDisplay/RoverChecklist.qml" line="71"/>
+        <source>Wind &amp; weather</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="123"/>
-        <source>DSMX (8 channels or more)</source>
+        <location filename="../src/FlightDisplay/RoverChecklist.qml" line="72"/>
+        <source>OK for your platform?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="178"/>
-        <source>Not Mapped</source>
+        <location filename="../src/FlightDisplay/RoverChecklist.qml" line="76"/>
+        <source>Mission area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="204"/>
-        <source>Attitude Controls</source>
+        <location filename="../src/FlightDisplay/RoverChecklist.qml" line="77"/>
+        <source>Mission area and path free of obstacles/people?</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SHPFileHelper</name>
     <message>
-        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="212"/>
-        <source>Roll</source>
+        <location filename="../src/SHPFileHelper.cc" line="18"/>
+        <source>SHP file load failed. %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="242"/>
-        <source>Pitch</source>
+        <location filename="../src/SHPFileHelper.cc" line="51"/>
+        <source>UTM projection is not in supported format. Must be PROJCS[&quot;WGS_1984_UTM_Zone_##N/S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="272"/>
-        <source>Yaw</source>
+        <location filename="../src/SHPFileHelper.cc" line="54"/>
+        <source>Only WGS84 or UTM projections are supported.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="302"/>
-        <source>Throttle</source>
+        <location filename="../src/SHPFileHelper.cc" line="57"/>
+        <source>PRJ file open failed: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="331"/>
-        <source>Skip</source>
+        <location filename="../src/SHPFileHelper.cc" line="60"/>
+        <source>File not found: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="337"/>
-        <source>Cancel</source>
+        <location filename="../src/SHPFileHelper.cc" line="63"/>
+        <source>File is not a .shp file: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="344"/>
-        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="347"/>
-        <source>Calibrate</source>
+        <location filename="../src/SHPFileHelper.cc" line="79"/>
+        <source>SHPOpen failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="370"/>
-        <source>Additional Radio setup:</source>
+        <location filename="../src/SHPFileHelper.cc" line="101"/>
+        <source>More than one entity found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="407"/>
-        <source>Spektrum Bind</source>
+        <location filename="../src/SHPFileHelper.cc" line="105"/>
+        <source>No supported types found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="412"/>
-        <source>Copy Trims</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="436"/>
-        <source>Mode 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="442"/>
-        <source>Mode 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>RadioComponentController</name>
-    <message>
-        <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="121"/>
-        <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.
-
-Click Next to continue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="124"/>
-        <source>Lower the Throttle stick all the way down as shown in diagram.
-Reset all transmitter trims to center.
-
-Please ensure all motor power is disconnected AND all props are removed from the vehicle.
-
-Click Next to continue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="127"/>
-        <source>Move the Throttle stick all the way up and hold it there...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="128"/>
-        <source>Move the Throttle stick all the way down and leave it there...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="129"/>
-        <source>Move the Yaw stick all the way to the left and hold it there...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="130"/>
-        <source>Move the Yaw stick all the way to the right and hold it there...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="131"/>
-        <source>Move the Roll stick all the way to the left and hold it there...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="132"/>
-        <source>Move the Roll stick all the way to the right and hold it there...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="133"/>
-        <source>Move the Pitch stick all the way down and hold it there...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="134"/>
-        <source>Move the Pitch stick all the way up and hold it there...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="135"/>
-        <source>Allow the Pitch stick to move back to center...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="136"/>
-        <source>Move all the transmitter switches and/or dials back and forth to their extreme positions.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="137"/>
-        <source>All settings have been captured. Click Next to write the new parameters to your board.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="204"/>
-        <source>Center the Throttle stick as shown in diagram.
-Reset all transmitter trims to center.
-
-Please ensure all motor power is disconnected from the vehicle.
-
-Click Next to continue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="813"/>
-        <source>Next</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="835"/>
-        <source>Calibrate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="859"/>
-        <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>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>RallyPointController</name>
-    <message>
-        <location filename="../src/MissionManager/RallyPointController.cc" line="99"/>
-        <source>Rally: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/MissionManager/RallyPointController.cc" line="102"/>
-        <source>Rally Points supports version %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>RallyPointEditorHeader</name>
-    <message>
-        <location filename="../src/PlanView/RallyPointEditorHeader.qml" line="30"/>
-        <source>Rally Points</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/PlanView/RallyPointEditorHeader.qml" line="51"/>
-        <source>Rally Points provide alternate landing points when performing a Return to Launch (RTL).</source>
-        <translation type="unfinished"></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"></translation>
-    </message>
-    <message>
-        <location filename="../src/PlanView/RallyPointEditorHeader.qml" line="63"/>
-        <source>This vehicle does not support Rally Points.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>RallyPointItemEditor</name>
-    <message>
-        <location filename="../src/PlanView/RallyPointItemEditor.qml" line="49"/>
-        <source>Rally Point</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/PlanView/RallyPointItemEditor.qml" line="72"/>
-        <source>Delete</source>
+        <location filename="../src/SHPFileHelper.cc" line="133"/>
+        <source>File does not contain a polygon.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>RallyPointMapVisuals</name>
     <message>
-        <location filename="../src/PlanView/RallyPointMapVisuals.qml" line="71"/>
-        <source>R</source>
-        <comment>rally point map item label</comment>
+        <location filename="../src/SHPFileHelper.cc" line="139"/>
+        <source>Only single part polygons are supported.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SHPFileHelper</name>
-    <message>
-        <location filename="../src/SHPFileHelper.cc" line="18"/>
-        <source>SHP file load failed. %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/SHPFileHelper.cc" line="51"/>
-        <source>UTM projection is not in supported format. Must be PROJCS[&quot;WGS_1984_UTM_Zone_##N/S</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/SHPFileHelper.cc" line="54"/>
-        <source>Only WGS84 or UTM projections are supported.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/SHPFileHelper.cc" line="57"/>
-        <source>PRJ file open failed: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/SHPFileHelper.cc" line="60"/>
-        <source>File not found: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>SafetyComponent</name>
     <message>
-        <location filename="../src/SHPFileHelper.cc" line="63"/>
-        <source>File is not a .shp file: %1</source>
+        <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"></translation>
     </message>
     <message>
-        <location filename="../src/SHPFileHelper.cc" line="79"/>
-        <source>SHPOpen failed.</source>
+        <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"></translation>
     </message>
     <message>
-        <location filename="../src/SHPFileHelper.cc" line="101"/>
-        <source>More than one entity found.</source>
+        <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"></translation>
     </message>
     <message>
-        <location filename="../src/SHPFileHelper.cc" line="105"/>
-        <source>No supported types found.</source>
+        <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"></translation>
     </message>
     <message>
-        <location filename="../src/SHPFileHelper.cc" line="133"/>
-        <source>File does not contain a polygon.</source>
+        <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"></translation>
     </message>
     <message>
-        <location filename="../src/SHPFileHelper.cc" line="139"/>
-        <source>Only single part polygons are supported.</source>
+        <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"></translation>
     </message>
-</context>
-<context>
-    <name>SafetyComponent</name>
     <message>
-        <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="130"/>
-        <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="130"/>
-        <source>Low Battery Failsafe Trigger</source>
+        <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"></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"/>
-        <source>Failsafe Action:</source>
+        <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"></translation>
     </message>
     <message>
-        <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="164"/>
-        <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="164"/>
-        <source>Battery Warn Level:</source>
+        <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"></translation>
     </message>
     <message>
-        <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="173"/>
-        <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="173"/>
-        <source>Battery Failsafe Level:</source>
+        <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"></translation>
     </message>
     <message>
-        <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="182"/>
-        <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="182"/>
-        <source>Battery Emergency Level:</source>
+        <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"></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="239"/>
+        <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="239"/>
         <source>RC Loss Failsafe Trigger</source>
         <translation type="unfinished"></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"></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"></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"></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"></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"></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"></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"></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>
+        <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"></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>
+        <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"></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>
+        <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"></translation>
+    </message>
+    <message>
+        <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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></translation>
     </message>
@@ -13348,11 +14290,6 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
         <source>Safety</source>
         <translation type="unfinished"></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"></translation>
-    </message>
 </context>
 <context>
     <name>SafetyComponentSummary</name>
@@ -13831,7 +14768,7 @@ Click Ok to start calibration.</source>
 <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"></translation>
     </message>
@@ -13940,7 +14877,7 @@ Click Ok to start calibration.</source>
         <translation type="unfinished"></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"></translation>
     </message>
@@ -13963,57 +14900,57 @@ Click Ok to start calibration.</source>
         <translation type="unfinished"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></translation>
     </message>
@@ -14021,27 +14958,27 @@ Click Ok to start calibration.</source>
 <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"></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"></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"></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"></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"></translation>
     </message>
@@ -14050,7 +14987,7 @@ Click Ok to start calibration.</source>
     <name>SimpleItemEditor</name>
     <message>
         <location filename="../src/PlanView/SimpleItemEditor.qml" line="25"/>
-        <source>Altitude relative to home altitude</source>
+        <source>Altitude relative to launch altitude</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -14086,7 +15023,7 @@ Actual AMSL altitude: %1 %2</source>
     </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"></translation>
     </message>
@@ -14101,203 +15038,336 @@ Actual AMSL altitude: %1 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/PlanView/SimpleItemEditor.qml" line="145"/>
-        <source>Altitude Relative To Home</source>
+        <location filename="../src/PlanView/SimpleItemEditor.qml" line="80"/>
+        <source>Move &apos;%1&apos; Takeoff to the %2 location.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/PlanView/SimpleItemEditor.qml" line="152"/>
-        <source>Altitude Above Mean Sea Level</source>
+        <location filename="../src/PlanView/SimpleItemEditor.qml" line="80"/>
+        <source>V</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/PlanView/SimpleItemEditor.qml" line="160"/>
-        <source>Altitude Above Terrain</source>
+        <location filename="../src/PlanView/SimpleItemEditor.qml" line="80"/>
+        <source>T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/PlanView/SimpleItemEditor.qml" line="222"/>
-        <source>Flight Speed</source>
+        <location filename="../src/PlanView/SimpleItemEditor.qml" line="80"/>
+        <source>desired</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>SimpleMissionItem</name>
     <message>
-        <location filename="../src/MissionManager/SimpleMissionItem.cc" line="411"/>
-        <source>Unknown: %1</source>
+        <location filename="../src/PlanView/SimpleItemEditor.qml" line="80"/>
+        <source>climbout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MissionManager/SimpleMissionItem.cc" line="418"/>
-        <source>H</source>
+        <location filename="../src/PlanView/SimpleItemEditor.qml" line="87"/>
+        <source>Ensure clear of obstacles and into the wind.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MissionManager/SimpleMissionItem.cc" line="422"/>
-        <source>Takeoff</source>
+        <location filename="../src/PlanView/SimpleItemEditor.qml" line="94"/>
+        <source>Done</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MissionManager/SimpleMissionItem.cc" line="424"/>
-        <source>Land</source>
+        <location filename="../src/PlanView/SimpleItemEditor.qml" line="107"/>
+        <source>Click in map to set planned Takeoff location.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MissionManager/SimpleMissionItem.cc" line="426"/>
-        <source>VTOL Takeoff</source>
+        <location filename="../src/PlanView/SimpleItemEditor.qml" line="108"/>
+        <source>Click in map to set planned Launch location.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MissionManager/SimpleMissionItem.cc" line="428"/>
-        <source>VTOL Land</source>
+        <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"></translation>
     </message>
     <message>
-        <location filename="../src/MissionManager/SimpleMissionItem.cc" line="430"/>
-        <source>ROI</source>
+        <location filename="../src/PlanView/SimpleItemEditor.qml" line="202"/>
+        <source>Altitude Relative To Launch</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>StructureScanComplexItem</name>
     <message>
-        <location filename="../src/MissionManager/StructureScanComplexItem.cc" line="203"/>
-        <source>%1 does not support loading this complex mission item type: %2:%3</source>
+        <location filename="../src/PlanView/SimpleItemEditor.qml" line="209"/>
+        <source>Altitude Above Mean Sea Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MissionManager/StructureScanComplexItem.cc" line="209"/>
-        <source>%1 version %2 not supported</source>
+        <location filename="../src/PlanView/SimpleItemEditor.qml" line="217"/>
+        <source>Altitude Above Terrain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MissionManager/StructureScanComplexItem.h" line="79"/>
-        <location filename="../src/MissionManager/StructureScanComplexItem.h" line="80"/>
-        <source>Structure Scan</source>
+        <location filename="../src/PlanView/SimpleItemEditor.qml" line="279"/>
+        <source>Flight Speed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>StructureScanEditor</name>
+    <name>SimpleMissionItem</name>
     <message>
-        <location filename="../src/PlanView/StructureScanEditor.qml" line="63"/>
-        <source>Note: Polygon respresents structure surface not vehicle flight path.</source>
+        <location filename="../src/MissionManager/SimpleMissionItem.cc" line="382"/>
+        <source>Unknown: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/PlanView/StructureScanEditor.qml" line="71"/>
-        <source>WARNING: Photo interval is below minimum interval (%1 secs) supported by camera.</source>
+        <location filename="../src/MissionManager/SimpleMissionItem.cc" line="389"/>
+        <source>L</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/PlanView/StructureScanEditor.qml" line="80"/>
+        <location filename="../src/MissionManager/SimpleMissionItem.cc" line="393"/>
+        <source>Takeoff</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/MissionManager/SimpleMissionItem.cc" line="395"/>
+        <source>Land</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/MissionManager/SimpleMissionItem.cc" line="397"/>
+        <source>VTOL Takeoff</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/MissionManager/SimpleMissionItem.cc" line="399"/>
+        <source>VTOL Land</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/MissionManager/SimpleMissionItem.cc" line="402"/>
+        <source>ROI</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>StructureScanComplexItem</name>
+    <message>
+        <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"></translation>
+    </message>
+    <message>
+        <location filename="../src/MissionManager/StructureScanComplexItem.cc" line="244"/>
+        <source>%1 version %2 not supported</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/MissionManager/StructureScanComplexItem.h" line="79"/>
+        <location filename="../src/MissionManager/StructureScanComplexItem.h" line="80"/>
+        <source>Structure Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>StructureScanEditor</name>
+    <message>
+        <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"></translation>
+    </message>
+    <message>
+        <location filename="../src/PlanView/StructureScanEditor.qml" line="100"/>
+        <source>Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/PlanView/StructureScanEditor.qml" line="101"/>
+        <source>Camera</source>
+        <translation type="unfinished"></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"></translation>
+    </message>
+    <message>
+        <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"></translation>
+    </message>
+    <message>
+        <location filename="../src/PlanView/StructureScanEditor.qml" line="130"/>
         <source>Scan Distance</source>
         <translation type="unfinished"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></translation>
     </message>
 </context>
+<context>
+    <name>SubChecklist</name>
+    <message>
+        <location filename="../src/FlightDisplay/SubChecklist.qml" line="25"/>
+        <source>Submarine Initial checks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightDisplay/SubChecklist.qml" line="28"/>
+        <source>Hardware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightDisplay/SubChecklist.qml" line="29"/>
+        <source>All seals in place?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightDisplay/SubChecklist.qml" line="50"/>
+        <source>Please arm the vehicle here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightDisplay/SubChecklist.qml" line="53"/>
+        <source>Actuators</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightDisplay/SubChecklist.qml" line="54"/>
+        <source>Move all control surfaces. Did they work properly?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightDisplay/SubChecklist.qml" line="58"/>
+        <source>Motors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightDisplay/SubChecklist.qml" line="59"/>
+        <source>Propellers free? Then throttle up gently. Working properly?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightDisplay/SubChecklist.qml" line="63"/>
+        <source>Mission</source>
+        <translation type="unfinished"></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"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightDisplay/SubChecklist.qml" line="72"/>
+        <source>Last preparations before launch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightDisplay/SubChecklist.qml" line="76"/>
+        <source>Payload</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightDisplay/SubChecklist.qml" line="77"/>
+        <source>Configured and started? Payload lid closed?</source>
+        <translation type="unfinished"></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"></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"></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"></translation>
     </message>
@@ -14316,171 +15386,169 @@ Actual AMSL altitude: %1 %2</source>
 <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"></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"></translation>
     </message>
     <message>
-        <location filename="../src/PlanView/SurveyItemEditor.qml" line="94"/>
-        <source>Save Preset</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/PlanView/SurveyItemEditor.qml" line="97"/>
-        <source>Delete Preset</source>
+        <location filename="../src/PlanView/SurveyItemEditor.qml" line="32"/>
+        <source>Done</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/PlanView/SurveyItemEditor.qml" line="97"/>
-        <source>This preset cannot be deleted.</source>
+        <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"></translation>
     </message>
     <message>
-        <location filename="../src/PlanView/SurveyItemEditor.qml" line="135"/>
-        <source>Custom (specify all settings)</source>
+        <location filename="../src/PlanView/SurveyItemEditor.qml" line="196"/>
+        <source>Grid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/PlanView/SurveyItemEditor.qml" line="136"/>
-        <source>Save Settings As Preset</source>
+        <location filename="../src/PlanView/SurveyItemEditor.qml" line="197"/>
+        <source>Camera</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/PlanView/SurveyItemEditor.qml" line="137"/>
-        <source>Delete Current Preset</source>
+        <location filename="../src/PlanView/SurveyItemEditor.qml" line="457"/>
+        <source>Save Preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/PlanView/SurveyItemEditor.qml" line="139"/>
-        <source>Presets:</source>
+        <location filename="../src/PlanView/SurveyItemEditor.qml" line="432"/>
+        <location filename="../src/PlanView/SurveyItemEditor.qml" line="434"/>
+        <source>Delete Preset</source>
         <translation type="unfinished"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></translation>
     </message>
     <message>
-        <location filename="../src/PlanView/SurveyItemEditor.qml" line="358"/>
-        <source>Save the current settings as a named preset.</source>
+        <location filename="../src/PlanView/SurveyItemEditor.qml" line="425"/>
+        <source>Apply Preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/PlanView/SurveyItemEditor.qml" line="363"/>
-        <source>Preset Name</source>
+        <location filename="../src/PlanView/SurveyItemEditor.qml" line="439"/>
+        <source>Are you sure you want to delete &apos;%1&apos; preset?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/PlanView/SurveyItemEditor.qml" line="373"/>
-        <source>Save Camera In Preset</source>
+        <location filename="../src/PlanView/SurveyItemEditor.qml" line="456"/>
+        <source>Save Settings As New Preset</source>
         <translation type="unfinished"></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>
+        <location filename="../src/PlanView/SurveyItemEditor.qml" line="533"/>
+        <source>Save the current settings as a named preset.</source>
         <translation type="unfinished"></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>
+        <location filename="../src/PlanView/SurveyItemEditor.qml" line="538"/>
+        <source>Preset Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MissionManager/SurveyMissionItem.cc" line="374"/>
-        <source>%1 but %2 object is missing</source>
+        <location filename="../src/PlanView/SurveyItemEditor.qml" line="552"/>
+        <source>Select Polygon File</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -14528,18 +15596,18 @@ Actual AMSL altitude: %1 %2</source>
 <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"></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"></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"></translation>
     </message>
@@ -14767,6 +15835,14 @@ Confirm change?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>TakeoffItemMapVisual</name>
+    <message>
+        <location filename="../src/PlanView/TakeoffItemMapVisual.qml" line="132"/>
+        <source>Launch</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>TcpSettings</name>
     <message>
@@ -14781,628 +15857,931 @@ Confirm change?</source>
     </message>
 </context>
 <context>
-    <name>TelemetryRSSIIndicator</name>
+    <name>TelemetryRSSIIndicator</name>
+    <message>
+        <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="48"/>
+        <source>Telemetry RSSI Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="58"/>
+        <source>Local RSSI:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="60"/>
+        <source>Remote RSSI:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="62"/>
+        <source>RX Errors:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="64"/>
+        <source>Errors Fixed:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="66"/>
+        <source>TX Buffer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="68"/>
+        <source>Local Noise:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="70"/>
+        <source>Remote Noise:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TerrainProgress</name>
+    <message>
+        <location filename="../src/FlightDisplay/TerrainProgress.qml" line="69"/>
+        <source>Terrain Load Progress</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FlightDisplay/TerrainProgress.qml" line="87"/>
+        <source>Done</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TerrainStatus</name>
+    <message>
+        <location filename="../src/PlanView/TerrainStatus.qml" line="51"/>
+        <source>Height AMSL (%1)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ToolBarBase</name>
+    <message>
+        <location filename="../src/ui/toolbar/ToolBarBase.qml" line="184"/>
+        <source>Advanced Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/toolbar/ToolBarBase.qml" line="354"/>
+        <source>Downloading Parameters</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/toolbar/ToolBarBase.qml" line="362"/>
+        <source>Click anywhere to hide</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/toolbar/ToolBarBase.qml" line="379"/>
+        <source>Waiting For Vehicle Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/toolbar/ToolBarBase.qml" line="401"/>
+        <source>Disconnect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/toolbar/ToolBarBase.qml" line="409"/>
+        <source>COMMUNICATION LOST</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TransectStyleComplexItem</name>
+    <message>
+        <location filename="../src/MissionManager/TransectStyleComplexItem.cc" line="211"/>
+        <source>TransectStyleComplexItem version %2 not supported</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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"></translation>
+    </message>
+    <message>
+        <location filename="../src/MissionManager/TransectStyleComplexItem.h" line="105"/>
+        <location filename="../src/MissionManager/TransectStyleComplexItem.h" line="106"/>
+        <source>Transect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/MissionManager/TransectStyleComplexItem.h" line="107"/>
+        <source>T</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TransectStyleComplexItemStats</name>
+    <message>
+        <location filename="../src/PlanView/TransectStyleComplexItemStats.qml" line="16"/>
+        <source>Survey Area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/PlanView/TransectStyleComplexItemStats.qml" line="19"/>
+        <source>Photo Count</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/PlanView/TransectStyleComplexItemStats.qml" line="22"/>
+        <source>Photo Interval</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/PlanView/TransectStyleComplexItemStats.qml" line="23"/>
+        <source>secs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/PlanView/TransectStyleComplexItemStats.qml" line="25"/>
+        <source>Trigger Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UAS</name>
+    <message>
+        <location filename="../src/uas/UAS.cc" line="621"/>
+        <source>UNINIT</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/uas/UAS.cc" line="622"/>
+        <source>Unitialized, booting up.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/uas/UAS.cc" line="625"/>
+        <source>BOOT</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/uas/UAS.cc" line="626"/>
+        <source>Booting system, please wait.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/uas/UAS.cc" line="629"/>
+        <source>CALIBRATING</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/uas/UAS.cc" line="630"/>
+        <source>Calibrating sensors, please wait.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/uas/UAS.cc" line="633"/>
+        <source>ACTIVE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/uas/UAS.cc" line="634"/>
+        <source>Active, normal operation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/uas/UAS.cc" line="637"/>
+        <source>STANDBY</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/uas/UAS.cc" line="638"/>
+        <source>Standby mode, ready for launch.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/uas/UAS.cc" line="641"/>
+        <source>CRITICAL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/uas/UAS.cc" line="642"/>
+        <source>FAILURE: Continuing operation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/uas/UAS.cc" line="645"/>
+        <source>EMERGENCY</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/uas/UAS.cc" line="646"/>
+        <source>EMERGENCY: Land Immediately!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/uas/UAS.cc" line="654"/>
+        <source>SHUTDOWN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/uas/UAS.cc" line="655"/>
+        <source>Powering off system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/uas/UAS.cc" line="659"/>
+        <source>UNKNOWN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/uas/UAS.cc" line="660"/>
+        <source>Unknown system state</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UASMessageHandler</name>
+    <message>
+        <location filename="../src/uas/UASMessageHandler.cc" line="156"/>
+        <source> EMERGENCY:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/uas/UASMessageHandler.cc" line="159"/>
+        <source> ALERT:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/uas/UASMessageHandler.cc" line="162"/>
+        <source> Critical:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/uas/UASMessageHandler.cc" line="165"/>
+        <source> Error:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/uas/UASMessageHandler.cc" line="168"/>
+        <source> Warning:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/uas/UASMessageHandler.cc" line="171"/>
+        <source> Notice:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/uas/UASMessageHandler.cc" line="174"/>
+        <source> Info:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/uas/UASMessageHandler.cc" line="177"/>
+        <source> Debug:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UDPConfiguration</name>
+    <message>
+        <location filename="../src/comm/UDPLink.h" line="130"/>
+        <source>UDP Link Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UDPLink</name>
     <message>
-        <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="46"/>
-        <source>Telemetry RSSI Status</source>
+        <location filename="../src/comm/UDPLink.cc" line="305"/>
+        <location filename="../src/comm/UDPLink.cc" line="349"/>
+        <source>UDP Link Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="56"/>
-        <source>Local RSSI:</source>
+        <location filename="../src/comm/UDPLink.cc" line="305"/>
+        <source>Error binding UDP port: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="58"/>
-        <source>Remote RSSI:</source>
+        <location filename="../src/comm/UDPLink.cc" line="349"/>
+        <source>Error registering Zeroconf</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>ULogParser</name>
     <message>
-        <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="60"/>
-        <source>RX Errors:</source>
+        <location filename="../src/AnalyzeView/ULogParser.cc" line="95"/>
+        <source>Could not detect ULog file header magic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="62"/>
-        <source>Errors Fixed:</source>
+        <location filename="../src/AnalyzeView/ULogParser.cc" line="180"/>
+        <source>Could not detect camera_capture packets in ULog</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>UdpSettings</name>
     <message>
-        <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="64"/>
-        <source>TX Buffer:</source>
+        <location filename="../src/ui/preferences/UdpSettings.qml" line="36"/>
+        <source>Listening Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="66"/>
-        <source>Local Noise:</source>
+        <location filename="../src/ui/preferences/UdpSettings.qml" line="59"/>
+        <source>Target Hosts:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="68"/>
-        <source>Remote Noise:</source>
+        <location filename="../src/ui/preferences/UdpSettings.qml" line="133"/>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/preferences/UdpSettings.qml" line="146"/>
+        <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TransectStyleComplexItem</name>
+    <name>UnitsFirstRunPrompt</name>
     <message>
-        <location filename="../src/MissionManager/TransectStyleComplexItem.cc" line="205"/>
-        <source>TransectStyleComplexItem version %2 not supported</source>
+        <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="21"/>
+        <source>Measurement Units</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MissionManager/TransectStyleComplexItem.cc" line="501"/>
-        <source>INTERNAL ERROR: TransectStyleComplexItem::_adjustTransectPointsForTerrain called when terrain data not ready. Plan will be incorrect.</source>
+        <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="27"/>
+        <source>Horizontal Distance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MissionManager/TransectStyleComplexItem.h" line="103"/>
-        <location filename="../src/MissionManager/TransectStyleComplexItem.h" line="104"/>
-        <source>Transect</source>
+        <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="27"/>
+        <source>Vertical Distance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/MissionManager/TransectStyleComplexItem.h" line="105"/>
-        <source>T</source>
+        <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="27"/>
+        <source>Area</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TransectStyleComplexItemStats</name>
     <message>
-        <location filename="../src/PlanView/TransectStyleComplexItemStats.qml" line="19"/>
-        <source>Survey Area</source>
+        <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="27"/>
+        <source>Speed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/PlanView/TransectStyleComplexItemStats.qml" line="22"/>
-        <source>Photo Count</source>
+        <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="27"/>
+        <source>Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/PlanView/TransectStyleComplexItemStats.qml" line="25"/>
-        <source>Photo Interval</source>
+        <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"></translation>
     </message>
     <message>
-        <location filename="../src/PlanView/TransectStyleComplexItemStats.qml" line="26"/>
-        <source>secs</source>
+        <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="84"/>
+        <source>System of units</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/PlanView/TransectStyleComplexItemStats.qml" line="28"/>
-        <source>Trigger Distance</source>
+        <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="97"/>
+        <source>Metric System</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="97"/>
+        <source>Imperial System</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>UAS</name>
+    <name>VTOLChecklist</name>
     <message>
-        <location filename="../src/uas/UAS.cc" line="646"/>
-        <source>UNINIT</source>
+        <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="25"/>
+        <source>VTOL Initial Checks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uas/UAS.cc" line="647"/>
-        <source>Unitialized, booting up.</source>
+        <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="28"/>
+        <source>Hardware</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uas/UAS.cc" line="650"/>
-        <source>BOOT</source>
+        <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="29"/>
+        <source>Props mounted? Wings secured? Tail secured?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uas/UAS.cc" line="651"/>
-        <source>Booting system, please wait.</source>
+        <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="50"/>
+        <source>Please arm the vehicle here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uas/UAS.cc" line="654"/>
-        <source>CALIBRATING</source>
+        <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="53"/>
+        <source>Actuators</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uas/UAS.cc" line="655"/>
-        <source>Calibrating sensors, please wait.</source>
+        <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="54"/>
+        <source>Move all control surfaces. Did they work properly?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uas/UAS.cc" line="658"/>
-        <source>ACTIVE</source>
+        <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="58"/>
+        <source>Motors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uas/UAS.cc" line="659"/>
-        <source>Active, normal operation.</source>
+        <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="59"/>
+        <source>Propellers free? Then throttle up gently. Working properly?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uas/UAS.cc" line="662"/>
-        <source>STANDBY</source>
+        <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="63"/>
+        <source>Mission</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uas/UAS.cc" line="663"/>
-        <source>Standby mode, ready for launch.</source>
+        <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="64"/>
+        <source>Please confirm mission is valid (waypoints valid, no terrain collision).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uas/UAS.cc" line="666"/>
-        <source>CRITICAL</source>
+        <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="72"/>
+        <source>Last preparations before launch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uas/UAS.cc" line="667"/>
-        <source>FAILURE: Continuing operation.</source>
+        <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="76"/>
+        <source>Payload</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uas/UAS.cc" line="670"/>
-        <source>EMERGENCY</source>
+        <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="77"/>
+        <source>Configured and started? Payload lid closed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uas/UAS.cc" line="671"/>
-        <source>EMERGENCY: Land Immediately!</source>
+        <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="82"/>
+        <source>OK for your platform? Lauching into the wind?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uas/UAS.cc" line="679"/>
-        <source>SHUTDOWN</source>
+        <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="86"/>
+        <source>Flight area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uas/UAS.cc" line="680"/>
-        <source>Powering off system.</source>
+        <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="87"/>
+        <source>Launch area and path free of obstacles/people?</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>VTOLLandingComplexItem</name>
     <message>
-        <location filename="../src/uas/UAS.cc" line="684"/>
-        <source>UNKNOWN</source>
+        <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"></translation>
     </message>
     <message>
-        <location filename="../src/uas/UAS.cc" line="685"/>
-        <source>Unknown system state</source>
+        <location filename="../src/MissionManager/VTOLLandingComplexItem.cc" line="223"/>
+        <source>%1 complex item version %2 not supported</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>UASMessageHandler</name>
-    <message>
-        <location filename="../src/uas/UASMessageHandler.cc" line="156"/>
-        <source> EMERGENCY:</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>VTOLLandingPatternEditor</name>
     <message>
-        <location filename="../src/uas/UASMessageHandler.cc" line="159"/>
-        <source> ALERT:</source>
+        <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="40"/>
+        <source>Set to vehicle heading</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uas/UASMessageHandler.cc" line="162"/>
-        <source> Critical:</source>
+        <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="41"/>
+        <source>Set to vehicle location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uas/UASMessageHandler.cc" line="165"/>
-        <source> Error:</source>
+        <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="58"/>
+        <source>Loiter point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uas/UASMessageHandler.cc" line="168"/>
-        <source> Warning:</source>
+        <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="74"/>
+        <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="132"/>
+        <source>Altitude</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uas/UASMessageHandler.cc" line="171"/>
-        <source> Notice:</source>
+        <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="82"/>
+        <source>Radius</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uas/UASMessageHandler.cc" line="174"/>
-        <source> Info:</source>
+        <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="93"/>
+        <source>Loiter clockwise</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uas/UASMessageHandler.cc" line="177"/>
-        <source> Debug:</source>
+        <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="109"/>
+        <source>Landing point</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>UDPConfiguration</name>
     <message>
-        <location filename="../src/comm/UDPLink.h" line="130"/>
-        <source>UDP Link Settings</source>
+        <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="125"/>
+        <source>Heading</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>UDPLink</name>
     <message>
-        <location filename="../src/comm/UDPLink.cc" line="305"/>
-        <location filename="../src/comm/UDPLink.cc" line="349"/>
-        <source>UDP Link Error</source>
+        <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="140"/>
+        <source>Landing Dist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/comm/UDPLink.cc" line="305"/>
-        <source>Error binding UDP port: %1</source>
+        <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="160"/>
+        <source>Altitudes relative to launch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/comm/UDPLink.cc" line="349"/>
-        <source>Error registering Zeroconf</source>
+        <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="170"/>
+        <source>Camera</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ULogParser</name>
     <message>
-        <location filename="../src/AnalyzeView/ULogParser.cc" line="95"/>
-        <source>Could not detect ULog file header magic</source>
+        <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="208"/>
+        <source>* Actual flight path will vary.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/AnalyzeView/ULogParser.cc" line="180"/>
-        <source>Could not detect camera_capture packets in ULog</source>
+        <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="217"/>
+        <source>* Avoid tailwind from loiter to land.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>UdpSettings</name>
     <message>
-        <location filename="../src/ui/preferences/UdpSettings.qml" line="36"/>
-        <source>Listening Port:</source>
+        <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="243"/>
+        <source>Click in map to set landing point.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences/UdpSettings.qml" line="59"/>
-        <source>Target Hosts:</source>
+        <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="250"/>
+        <source>- or -</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences/UdpSettings.qml" line="133"/>
-        <source>Add</source>
+        <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"></translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences/UdpSettings.qml" line="146"/>
-        <source>Remove</source>
+        <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="285"/>
+        <source>Done</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>VTOLModeIndicator</name>
+    <name>VTOLLandingPatternMapVisual</name>
     <message>
-        <location filename="../src/ui/toolbar/VTOLModeIndicator.qml" line="26"/>
-        <source>VTOL: Fixed Wing</source>
+        <location filename="../src/PlanView/VTOLLandingPatternMapVisual.qml" line="217"/>
+        <source>Loiter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/toolbar/VTOLModeIndicator.qml" line="26"/>
-        <source>VTOL: Multi-Rotor</source>
+        <location filename="../src/PlanView/VTOLLandingPatternMapVisual.qml" line="238"/>
+        <source>Land</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>ValuePageWidget</name>
+    <name>VTOLModeIndicator</name>
     <message>
-        <location filename="../src/FlightMap/Widgets/ValuePageWidget.qml" line="40"/>
-        <source>Value Widget Setup</source>
+        <location filename="../src/ui/toolbar/VTOLModeIndicator.qml" line="24"/>
+        <source>VTOL: FW</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FlightMap/Widgets/ValuePageWidget.qml" line="168"/>
-        <source>Select the values you want to display:</source>
+        <location filename="../src/ui/toolbar/VTOLModeIndicator.qml" line="24"/>
+        <source>VTOL: MR</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/FlightMap/Widgets/ValuePageWidget.qml" line="285"/>
-        <source>Large</source>
+        <location filename="../src/ui/toolbar/VTOLModeIndicator.qml" line="25"/>
+        <source>VTOL: Fixed Wing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/toolbar/VTOLModeIndicator.qml" line="25"/>
+        <source>VTOL: Multi-Rotor</source>
         <translation type="unfinished"></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"></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"></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"></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"></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"></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"></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"></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"></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"></translation>
     </message>
     <message>
-        <location filename="../src/Vehicle/Vehicle.cc" line="2535"/>
-        <source>Mission transfer failed. Retry transfer. Error: %1</source>
+        <location filename="../src/Vehicle/Vehicle.cc" line="2671"/>
+        <source>Mission transfer failed. Error: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Vehicle/Vehicle.cc" line="2541"/>
-        <source>GeoFence transfer failed. Retry transfer. Error: %1</source>
+        <location filename="../src/Vehicle/Vehicle.cc" line="2677"/>
+        <source>GeoFence transfer failed. Error: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/Vehicle/Vehicle.cc" line="2547"/>
-        <source>Rally Point transfer failed. Retry transfer. Error: %1</source>
+        <location filename="../src/Vehicle/Vehicle.cc" line="2683"/>
+        <source>Rally Point transfer failed. Error: %1</source>
         <translation type="unfinished"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></translation>
     </message>
@@ -15446,6 +16825,34 @@ Confirm change?</source>
         <translation type="unfinished"></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"></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"></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>
@@ -15480,110 +16887,71 @@ Confirm change?</source>
     </message>
 </context>
 <context>
-    <name>VideoPageWidget</name>
-    <message>
-        <location filename="../src/FlightMap/Widgets/VideoPageWidget.qml" line="56"/>
-        <source>Enable Stream</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/FlightMap/Widgets/VideoPageWidget.qml" line="76"/>
-        <source>Grid Lines</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/FlightMap/Widgets/VideoPageWidget.qml" line="95"/>
-        <source>Video Screen Fit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/FlightMap/Widgets/VideoPageWidget.qml" line="105"/>
-        <source>Stop Recording</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/FlightMap/Widgets/VideoPageWidget.qml" line="105"/>
-        <source>Record Stream</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>VideoManager</name>
     <message>
-        <location filename="../src/FlightMap/Widgets/VideoPageWidget.qml" line="156"/>
-        <source>Video Streaming Not Configured</source>
+        <location filename="../src/VideoManager/VideoManager.cc" line="286"/>
+        <source>Video receiver is not ready.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>VideoReceiver</name>
     <message>
-        <location filename="../src/VideoStreaming/VideoReceiver.cc" line="675"/>
+        <location filename="../src/VideoManager/VideoManager.cc" line="293"/>
         <source>Invalid video format defined.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/VideoStreaming/VideoReceiver.cc" line="698"/>
+        <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"></translation>
     </message>
 </context>
 <context>
-    <name>ViewWidget</name>
-    <message>
-        <location filename="../src/ViewWidgets/ViewWidget.qml" line="61"/>
-        <source>missing connected implementation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/ViewWidgets/ViewWidget.qml" line="81"/>
-        <source>no vehicle connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>linechart</name>
+    <name>VideoPageWidget</name>
     <message>
-        <location filename="../src/ui/linechart/Linechart.ui" line="26"/>
-        <source>Form</source>
+        <location filename="../src/FlightMap/Widgets/VideoPageWidget.qml" line="85"/>
+        <source>Grid Lines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/linechart/Linechart.ui" line="130"/>
-        <source>Filter... (Ctrl+F)</source>
+        <location filename="../src/FlightMap/Widgets/VideoPageWidget.qml" line="63"/>
+        <source>Enable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/linechart/Linechart.ui" line="138"/>
-        <source>All MAVs</source>
+        <location filename="../src/FlightMap/Widgets/VideoPageWidget.qml" line="104"/>
+        <source>Video Fit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/linechart/Linechart.ui" line="156"/>
-        <source>Display only variable names in curve list</source>
+        <location filename="../src/FlightMap/Widgets/VideoPageWidget.qml" line="115"/>
+        <source>File Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/linechart/Linechart.ui" line="159"/>
-        <source>Short names</source>
+        <location filename="../src/FlightMap/Widgets/VideoPageWidget.qml" line="126"/>
+        <source>Stop Recording</source>
         <translation type="unfinished"></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>
+        <location filename="../src/FlightMap/Widgets/VideoPageWidget.qml" line="126"/>
+        <source>Record Stream</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/linechart/Linechart.ui" line="172"/>
-        <source>Show units</source>
+        <location filename="../src/FlightMap/Widgets/VideoPageWidget.qml" line="177"/>
+        <source>Video Streaming Not Configured</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>ViewWidget</name>
     <message>
-        <location filename="../src/ui/linechart/Linechart.ui" line="208"/>
-        <source>Rotate color scheme for all curves</source>
+        <location filename="../src/ViewWidgets/ViewWidget.qml" line="61"/>
+        <source>missing connected implementation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/linechart/Linechart.ui" line="211"/>
-        <source>Recolor</source>
+        <location filename="../src/ViewWidgets/ViewWidget.qml" line="81"/>
+        <source>no vehicle connected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>